tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r746356 [1/8] - in /tuscany/java/sca/modules: assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xm...
Date Fri, 20 Feb 2009 20:10:44 GMT
Author: rfeng
Date: Fri Feb 20 20:10:37 2009
New Revision: 746356

URL: http://svn.apache.org/viewvc?rev=746356&view=rev
Log:
Start to implement the SCA policy framework 1.1 spec draft from OASIS OpenCSA

Added:
    tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java
      - copied, changed from r745561, tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java   (with props)
    tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
      - copied, changed from r745561, tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
    tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
      - copied, changed from r745561, tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/BindingType.java   (with props)
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java   (with props)
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java   (with props)
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java   (with props)
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java   (with props)
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyResolver.java   (with props)
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java   (with props)
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java   (with props)
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java   (with props)
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java   (with props)
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java   (with props)
Removed:
    tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
    tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
    tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
    tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
    tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
    tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
    tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
    tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
    tuscany/java/sca/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
Modified:
    tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
    tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
    tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
    tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
    tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
    tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
    tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
    tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
    tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
    tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
    tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
    tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
    tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
    tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
    tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
    tuscany/java/sca/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
    tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
    tuscany/java/sca/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
    tuscany/java/sca/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
    tuscany/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationPolicy.java
    tuscany/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationReferencePolicyProvider.java
    tuscany/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/token/Axis2TokenAuthenticationServicePolicyProvider.java
    tuscany/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
    tuscany/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyHandler.java
    tuscany/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderPolicy.java
    tuscany/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderReferencePolicyProvider.java
    tuscany/java/sca/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/header/Axis2HeaderServicePolicyProvider.java
    tuscany/java/sca/modules/binding-ws-axis2/pom.xml
    tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
    tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingProviderFactory.java
    tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
    tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
    tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
    tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
    tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInMessageReceiver.java
    tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceInOutSyncMessageReceiver.java
    tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
    tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
    tuscany/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
    tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/configparams/definitions.xml
    tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/intent/definitions.xml
    tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/definitions.xml
    tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
    tuscany/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
    tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
    tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
    tuscany/java/sca/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
    tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
    tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
    tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
    tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
    tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
    tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
    tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
    tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java
    tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
    tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
    tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
    tuscany/java/sca/modules/definitions-xml/pom.xml
    tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
    tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
    tuscany/java/sca/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    tuscany/java/sca/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
    tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
    tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
    tuscany/java/sca/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
    tuscany/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
    tuscany/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
    tuscany/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
    tuscany/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
    tuscany/java/sca/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
    tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
    tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
    tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
    tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
    tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
    tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
    tuscany/java/sca/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
    tuscany/java/sca/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
    tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
    tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
    tuscany/java/sca/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
    tuscany/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
    tuscany/java/sca/modules/implementation-node/META-INF/MANIFEST.MF
    tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
    tuscany/java/sca/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
    tuscany/java/sca/modules/implementation-web/META-INF/MANIFEST.MF
    tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
    tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
    tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
    tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
    tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
    tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
    tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
    tuscany/java/sca/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
    tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
    tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
    tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
    tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
    tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
    tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
    tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
    tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
    tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
    tuscany/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
    tuscany/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
    tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ws/TestPolicyProcessor.java
    tuscany/java/sca/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
    tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
    tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
    tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
    tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
    tuscany/java/sca/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
    tuscany/java/sca/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
    tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
    tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
    tuscany/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
    tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
    tuscany/java/sca/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/DefaultContributionBuilderExtensionPoint.java

Modified: tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java?rev=746356&r1=746355&r2=746356&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java Fri Feb 20 20:10:37 2009
@@ -58,7 +58,6 @@
 import org.apache.tuscany.sca.assembly.ComponentService;
 import org.apache.tuscany.sca.assembly.ComponentType;
 import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
 import org.apache.tuscany.sca.assembly.ConstrainingType;
 import org.apache.tuscany.sca.assembly.Contract;
 import org.apache.tuscany.sca.assembly.Extensible;
@@ -66,7 +65,6 @@
 import org.apache.tuscany.sca.assembly.ExtensionFactory;
 import org.apache.tuscany.sca.assembly.Implementation;
 import org.apache.tuscany.sca.assembly.Multiplicity;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
 import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.assembly.Service;
 import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
@@ -82,13 +80,8 @@
 import org.apache.tuscany.sca.monitor.Problem;
 import org.apache.tuscany.sca.monitor.Problem.Severity;
 import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPoint;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
 import org.apache.tuscany.sca.policy.PolicyFactory;
 import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.util.PolicyValidationException;
-import org.apache.tuscany.sca.policy.util.PolicyValidationUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
@@ -106,7 +99,7 @@
     protected ExtensionFactory extensionFactory;
     protected PolicyFactory policyFactory;
     protected StAXArtifactProcessor<Object> extensionProcessor;
-    protected PolicyAttachPointProcessor policyProcessor;
+    protected PolicySubjectProcessor policyProcessor;
     private DocumentBuilderFactory documentBuilderFactory;
     private Monitor monitor;
 
@@ -117,7 +110,7 @@
      */
     @SuppressWarnings("unchecked")
     protected BaseAssemblyProcessor(AssemblyFactory assemblyFactory,
-    		                        ExtensionFactory extensionFactory,
+                                    ExtensionFactory extensionFactory,
                                     PolicyFactory policyFactory,
                                     DocumentBuilderFactory documentBuilderFactory,
                                     StAXArtifactProcessor extensionProcessor,
@@ -127,10 +120,10 @@
         this.policyFactory = policyFactory;
         this.documentBuilderFactory = documentBuilderFactory;
         this.extensionProcessor = (StAXArtifactProcessor<Object>)extensionProcessor;
-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
+        this.policyProcessor = new PolicySubjectProcessor(policyFactory);
         this.monitor = monitor;
     }
-    
+
     /**
      * @param modelFactories
      * @param staxProcessor
@@ -144,10 +137,10 @@
         this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
         this.documentBuilderFactory = modelFactories.getFactory(DocumentBuilderFactory.class);
         this.extensionProcessor = (StAXArtifactProcessor<Object>)staxProcessor;
-        this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
+        this.policyProcessor = new PolicySubjectProcessor(policyFactory);
         this.monitor = monitor;
     }
-    
+
     /**
      * Marshals warnings into the monitor
      * 
@@ -156,12 +149,18 @@
      * @param messageParameters
      */
     protected void warning(String message, Object model, String... messageParameters) {
-        if (monitor != null){
-            Problem problem = monitor.createProblem(this.getClass().getName(), "assembly-xml-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
+        if (monitor != null) {
+            Problem problem =
+                monitor.createProblem(this.getClass().getName(),
+                                      "assembly-xml-validation-messages",
+                                      Severity.WARNING,
+                                      model,
+                                      message,
+                                      (Object[])messageParameters);
             monitor.problem(problem);
         }
     }
-    
+
     /**
      * Marshals errors into the monitor
      * 
@@ -170,12 +169,18 @@
      * @param model
      */
     protected void error(String message, Object model, Object... messageParameters) {
-    	if (monitor != null) {
-	        Problem problem = monitor.createProblem(this.getClass().getName(), "assembly-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-	        monitor.problem(problem);
-    	}
+        if (monitor != null) {
+            Problem problem =
+                monitor.createProblem(this.getClass().getName(),
+                                      "assembly-xml-validation-messages",
+                                      Severity.ERROR,
+                                      model,
+                                      message,
+                                      (Object[])messageParameters);
+            monitor.problem(problem);
+        }
     }
-    
+
     /**
      * Marshals exceptions into the monitor
      * 
@@ -184,10 +189,16 @@
      * @param model
      */
     protected void error(String message, Object model, Exception ex) {
-    	if (monitor != null) {
-	        Problem problem = monitor.createProblem(this.getClass().getName(), "assembly-xml-validation-messages", Severity.ERROR, model, message, ex);
-	        monitor.problem(problem);
-    	}
+        if (monitor != null) {
+            Problem problem =
+                monitor.createProblem(this.getClass().getName(),
+                                      "assembly-xml-validation-messages",
+                                      Severity.ERROR,
+                                      model,
+                                      message,
+                                      ex);
+            monitor.problem(problem);
+        }
     }
 
     /**
@@ -261,7 +272,7 @@
             reference.setMultiplicity(Multiplicity.ONE_ONE);
         }
     }
-    
+
     protected XAttr writeMultiplicity(AbstractReference reference) {
         Multiplicity multiplicity = reference.getMultiplicity();
         if (multiplicity != null) {
@@ -323,7 +334,7 @@
      * @throws ContributionResolveException
      */
     protected Implementation resolveImplementation(Implementation implementation, ModelResolver resolver)
-        throws ContributionResolveException, PolicyValidationException {
+        throws ContributionResolveException {
         if (implementation != null) {
             if (implementation.isUnresolved()) {
                 implementation = resolver.resolveModel(Implementation.class, implementation);
@@ -332,71 +343,24 @@
                 if (implementation.isUnresolved()) {
                     extensionProcessor.resolve(implementation, resolver);
                     if (!implementation.isUnresolved()) {
-                        //resolve policies
-                        if ( implementation instanceof PolicySetAttachPoint ) {
-                            PolicySetAttachPoint policiedImpl = (PolicySetAttachPoint)implementation;
-                            resolveIntents(policiedImpl.getRequiredIntents(), resolver);
-                            PolicyValidationUtils.validateIntents(policiedImpl, policiedImpl.getType());
-                            
-                            resolvePolicySets(policiedImpl.getPolicySets(), resolver);
-                            PolicyValidationUtils.validatePolicySets(policiedImpl);
-                            
-                            if ( implementation instanceof OperationsConfigurator ) {
-                                OperationsConfigurator opsConfigurator = (OperationsConfigurator)implementation;
-                                for ( ConfiguredOperation implOp : opsConfigurator.getConfiguredOperations() ) {
-                                    resolveIntents(implOp.getRequiredIntents(), resolver);
-                                    PolicyValidationUtils.validateIntents(implOp, policiedImpl.getType());
-                                    
-                                    resolvePolicySets(implOp.getPolicySets(), resolver);
-                                    PolicyValidationUtils.validatePolicySets(implOp, 
-                                                                             policiedImpl.getType(),
-                                                                             policiedImpl.getApplicablePolicySets());
-                                }
-                            }
-                            
-                            for ( Service service : implementation.getServices() ) {
-                                resolveIntents(service.getRequiredIntents(), resolver);
-                                resolvePolicySets(service.getPolicySets(), resolver);
-                                
-                                for ( ConfiguredOperation svcOp : service.getConfiguredOperations() ) {
-                                    resolveIntents(svcOp.getRequiredIntents(), resolver);
-                                    resolvePolicySets(svcOp.getPolicySets(), resolver);
-                                }
-                            }
-                            
-                            for ( Reference reference : implementation.getReferences() ) {
-                                resolveIntents(reference.getRequiredIntents(), resolver);
-                                resolvePolicySets(reference.getPolicySets(), resolver);
-                            }
-                        }
-                        
                         resolver.addModel(implementation);
                     }
                 }
             }
-            
-            if ( implementation instanceof IntentAttachPoint &&
-                ((IntentAttachPoint)implementation).getType() != null && 
-                ((IntentAttachPoint)implementation).getType().isUnresolved() ) {
-                ((IntentAttachPoint)implementation).setType(
-                               resolver.resolveModel(IntentAttachPointType.class, 
-                                                     ((IntentAttachPoint)implementation).getType()));
-            }
         }
         return implementation;
     }
-    
+
     /**
      * Resolve interface, callback interface and bindings on a list of contracts.
      * @param contracts the list of contracts
      * @param resolver the resolver to use to resolve models
      */
     protected <C extends Contract> void resolveContracts(List<C> contracts, ModelResolver resolver)
-    throws ContributionResolveException {
+        throws ContributionResolveException {
         resolveContracts(null, contracts, resolver);
     }
 
-    
     /**
      * Resolve interface, callback interface and bindings on a list of contracts.
      * @param parent element for the contracts
@@ -405,143 +369,32 @@
      */
     protected <C extends Contract> void resolveContracts(Base parent, List<C> contracts, ModelResolver resolver)
         throws ContributionResolveException {
-        
-        String parentName = (parent instanceof Composite) ? ((Composite)parent).getName().toString() :
-            (parent instanceof Component) ? ((Component)parent).getName() : "UNKNOWN";
-        
+
+        String parentName =
+            (parent instanceof Composite) ? ((Composite)parent).getName().toString() : (parent instanceof Component)
+                ? ((Component)parent).getName() : "UNKNOWN";
+
         for (Contract contract : contracts) {
-            try {
-                //resolve the intents and policysets as they need to be copied over into the
-                //child binding elements
-                resolveIntents(contract.getRequiredIntents(), resolver);
-                resolvePolicySets(contract.getPolicySets(), resolver);
-                resolvePolicySets(contract.getApplicablePolicySets(), resolver);
-                
-                // Inherit the composite / component level applicable policy sets.
-                if ( parent != null && parent instanceof PolicySetAttachPoint )  {
-                    addInheritedPolicySets(((PolicySetAttachPoint)parent).getApplicablePolicySets(), contract.getApplicablePolicySets());
-                }
-                
-                for ( ConfiguredOperation confOp : contract.getConfiguredOperations() ) {
-                    resolveIntents(confOp.getRequiredIntents(), resolver);
-                    resolvePolicySets(confOp.getPolicySets(), resolver);
-                    resolvePolicySets(confOp.getApplicablePolicySets(), resolver);
-                    
-                    //inherit applicable policy sets from parent contract
-                    addInheritedPolicySets(contract.getApplicablePolicySets(), confOp.getApplicablePolicySets());
-                }
-                                
-                // Resolve the interface contract
-                InterfaceContract interfaceContract = contract.getInterfaceContract();
-                if (interfaceContract != null) {
-                    extensionProcessor.resolve(interfaceContract, resolver);
-                }
-    
-                // Resolve bindings
-                for (int i = 0, n = contract.getBindings().size(); i < n; i++) {
-                    Binding binding = contract.getBindings().get(i);
+            // Resolve the interface contract
+            InterfaceContract interfaceContract = contract.getInterfaceContract();
+            if (interfaceContract != null) {
+                extensionProcessor.resolve(interfaceContract, resolver);
+            }
+
+            // Resolve bindings
+            for (int i = 0, n = contract.getBindings().size(); i < n; i++) {
+                Binding binding = contract.getBindings().get(i);
+                extensionProcessor.resolve(binding, resolver);
+
+            }
+
+            // Resolve callback bindings
+            if (contract.getCallback() != null) {
+
+                for (int i = 0, n = contract.getCallback().getBindings().size(); i < n; i++) {
+                    Binding binding = contract.getCallback().getBindings().get(i);
                     extensionProcessor.resolve(binding, resolver);
-                    
-                    if (binding instanceof IntentAttachPoint) {
-                        IntentAttachPoint policiedBinding = (IntentAttachPoint)binding;
-                        
-                        if ( policiedBinding.getType() != null && policiedBinding.getType().isUnresolved() ) {
-                            IntentAttachPointType resolved = 
-                                resolver.resolveModel(IntentAttachPointType.class, 
-                                                      policiedBinding.getType());
-                            policiedBinding.setType(resolved);
-                        }
-                        
-                        resolveIntents(policiedBinding.getRequiredIntents(), resolver);
-                        PolicyValidationUtils.validateIntents(policiedBinding, policiedBinding.getType());
-                    }
-                    
-                    if (binding instanceof PolicySetAttachPoint) {
-                        PolicySetAttachPoint policiedBinding = (PolicySetAttachPoint)binding;
-                        resolvePolicySets(policiedBinding.getPolicySets(), resolver);
-                        //validate if attached policysets apply to the binding
-                        resolvePolicySets(policiedBinding.getApplicablePolicySets(), resolver);
-                        //inherit the applicable policysets from parent contract as whatever applies to that
-                        //applies to the binding as well
-                        addInheritedPolicySets(contract.getApplicablePolicySets(), policiedBinding.getApplicablePolicySets());
-                        PolicyValidationUtils.validatePolicySets(policiedBinding);
-                    }
-                    
-                    if (binding instanceof OperationsConfigurator) {
-                        OperationsConfigurator opConfigurator = (OperationsConfigurator)binding;
-                        for (ConfiguredOperation confOp : opConfigurator.getConfiguredOperations()) {
-                            resolveIntents(confOp.getRequiredIntents(), resolver);
-                            PolicyValidationUtils.validateIntents(confOp, ((PolicySetAttachPoint)binding).getType());
-                            
-                            resolvePolicySets(confOp.getPolicySets(), resolver);
-                            resolvePolicySets(confOp.getApplicablePolicySets(), resolver);
-                            //inherit the applicable policysets from parent binding as whatever applies to that
-                            //applies to the binding as well
-                            addInheritedPolicySets(((PolicySetAttachPoint)binding).getApplicablePolicySets(), 
-                                                   confOp.getApplicablePolicySets());
-                            PolicyValidationUtils.validatePolicySets(confOp, ((PolicySetAttachPoint)binding).getType());
-                        }
-                    }
                 }
-    
-                // Resolve callback bindings
-                if (contract.getCallback() != null) {
-                    resolveIntents(contract.getCallback().getRequiredIntents(), resolver);
-                    resolvePolicySets(contract.getCallback().getPolicySets(), resolver);
-                    resolvePolicySets(contract.getCallback().getApplicablePolicySets(), resolver);
-                    //inherit the contract's policy intents and policysets
-                    addInheritedPolicySets(contract.getApplicablePolicySets(), contract.getCallback().getApplicablePolicySets());
-                    
-                    for (int i = 0, n = contract.getCallback().getBindings().size(); i < n; i++) {
-                        Binding binding = contract.getCallback().getBindings().get(i);
-                        extensionProcessor.resolve(binding, resolver);
-    
-                        if (binding instanceof IntentAttachPoint) {
-                            IntentAttachPoint policiedBinding = (IntentAttachPoint)binding;
-                            
-                            if ( policiedBinding.getType().isUnresolved() ) {
-                                IntentAttachPointType resolved = 
-                                    resolver.resolveModel(IntentAttachPointType.class, 
-                                                          policiedBinding.getType());
-                                policiedBinding.setType(resolved);
-                            }
-                            
-                            resolveIntents(policiedBinding.getRequiredIntents(), resolver);
-                            PolicyValidationUtils.validateIntents(policiedBinding, policiedBinding.getType());
-                        }
-                        
-                        if (binding instanceof PolicySetAttachPoint) {
-                            PolicySetAttachPoint policiedBinding = (PolicySetAttachPoint)binding;
-                            resolvePolicySets(policiedBinding.getPolicySets(), resolver);
-                            //validate if attached policysets apply to the binding
-                            resolvePolicySets(policiedBinding.getApplicablePolicySets(), resolver);
-                            //inherit the applicable policysets from parent contract as whatever applies to that
-                            //applies to the binding as well
-                            addInheritedPolicySets(contract.getApplicablePolicySets(), policiedBinding.getApplicablePolicySets());
-                            PolicyValidationUtils.validatePolicySets(policiedBinding);
-                        }
-                        
-                        if (binding instanceof OperationsConfigurator) {
-                            OperationsConfigurator opConfigurator = (OperationsConfigurator)binding;
-                            for (ConfiguredOperation confOp : opConfigurator.getConfiguredOperations()) {
-                                resolveIntents(confOp.getRequiredIntents(), resolver);
-                                PolicyValidationUtils.validateIntents(confOp, ((PolicySetAttachPoint)binding).getType());
-                                
-                                resolvePolicySets(confOp.getPolicySets(), resolver);
-                                resolvePolicySets(confOp.getApplicablePolicySets(), resolver);
-                                //inherit the applicable policysets from parent binding as whatever applies to that
-                                //applies to the binding as well
-                                addInheritedPolicySets(((PolicySetAttachPoint)binding).getApplicablePolicySets(), 
-                                                       confOp.getApplicablePolicySets());
-                                PolicyValidationUtils.validatePolicySets(confOp, ((PolicySetAttachPoint)binding).getType());
-                            }
-                        }
-                    }
-                }
-            } catch ( PolicyValidationException e ) {
-            	error("PolicyServiceValidationException", contract, contract.getName(), parentName, e.getMessage());
-                //throw new ContributionResolveException("PolicyValidation exceptions when processing service/reference '" 
-                                                       //+ contract.getName() + "' in '" + parentName + "'");
             }
         }
     }
@@ -597,8 +450,8 @@
             }
             document = documentBuilderFactory.newDocumentBuilder().newDocument();
         } catch (ParserConfigurationException e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error("ContributionReadException", documentBuilderFactory, ce);
+            ContributionReadException ce = new ContributionReadException(e);
+            error("ContributionReadException", documentBuilderFactory, ce);
             throw ce;
         }
 
@@ -748,42 +601,6 @@
     }
 
     /**
-     * Resolve policy intents attached to a specific SCA Artifact
-     * @param policyIntents list of policy intents
-     * @param resolver
-     */
-    protected void resolveIntents(List<Intent> policyIntents, ModelResolver resolver) {
-        List<Intent> requiredIntents = new ArrayList<Intent>();
-        Intent resolvedIntent = null;
-        for (Intent intent : policyIntents) {
-            resolvedIntent = resolver.resolveModel(Intent.class, intent);
-            requiredIntents.add(resolvedIntent);
-        }
-        policyIntents.clear();
-        policyIntents.addAll(requiredIntents);
-    }
-
-    /**
-     * Resolve policy sets attached to a specific SCA Construct
-     * @param policySets list of attached policy sets
-     * @param resolver
-     */
-    protected void resolvePolicySets(List<PolicySet> policySets, ModelResolver resolver) {
-        List<PolicySet> resolvedPolicySets = new ArrayList<PolicySet>();
-        PolicySet resolvedPolicySet = null;
-        for (PolicySet policySet : policySets) {
-            if (policySet.isUnresolved()) {
-                resolvedPolicySet = resolver.resolveModel(PolicySet.class, policySet);
-                resolvedPolicySets.add(resolvedPolicySet);
-            } else {
-                resolvedPolicySets.add(policySet);
-            }
-        }
-        policySets.clear();
-        policySets.addAll(resolvedPolicySets);
-    }
-
-    /**
      * Write the value of a property 
      * @param document
      * @param element
@@ -802,8 +619,7 @@
                 Node node = nodeList.item(item);
                 int nodeType = node.getNodeType();
                 if (nodeType == Node.ELEMENT_NODE) {
-                    XMLStreamReader reader =
-                        XMLInputFactory.newInstance().createXMLStreamReader(new DOMSource(node));
+                    XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new DOMSource(node));
 
                     while (reader.hasNext()) {
                         switch (reader.next()) {
@@ -851,19 +667,19 @@
             }
         }
     }
-    
+
     protected void addInheritedIntents(List<Intent> sourceList, List<Intent> targetList) {
         if (sourceList != null) {
             targetList.addAll(sourceList);
         }
     }
-    
-    protected  void addInheritedPolicySets(List<PolicySet> sourceList, List<PolicySet> targetList) {
+
+    protected void addInheritedPolicySets(List<PolicySet> sourceList, List<PolicySet> targetList) {
         if (sourceList != null) {
             targetList.addAll(sourceList);
         }
     }
-    
+
     /**
      * 
      * @param reader
@@ -873,15 +689,19 @@
      * @throws ContributionReadException
      * @throws XMLStreamException
      */
-    protected void readExtendedAttributes(XMLStreamReader reader, QName elementName, Extensible estensibleElement, StAXAttributeProcessor extensionAttributeProcessor) throws ContributionReadException, XMLStreamException {
+    protected void readExtendedAttributes(XMLStreamReader reader,
+                                          QName elementName,
+                                          Extensible estensibleElement,
+                                          StAXAttributeProcessor extensionAttributeProcessor)
+        throws ContributionReadException, XMLStreamException {
         for (int a = 0; a < reader.getAttributeCount(); a++) {
             QName attributeName = reader.getAttributeName(a);
-            if( attributeName.getNamespaceURI() != null && attributeName.getNamespaceURI().length() > 0) {
-                if( ! elementName.getNamespaceURI().equals(attributeName.getNamespaceURI()) ) {
+            if (attributeName.getNamespaceURI() != null && attributeName.getNamespaceURI().length() > 0) {
+                if (!elementName.getNamespaceURI().equals(attributeName.getNamespaceURI())) {
                     Object attributeValue = extensionAttributeProcessor.read(attributeName, reader);
                     Extension attributeExtension;
                     if (attributeValue instanceof Extension) {
-                        attributeExtension = (Extension) attributeValue;
+                        attributeExtension = (Extension)attributeValue;
                     } else {
                         attributeExtension = extensionFactory.createExtension(attributeName, attributeValue, true);
                     }
@@ -890,7 +710,6 @@
             }
         }
     }
-    
 
     /**
      * 
@@ -901,26 +720,29 @@
      * @throws ContributionWriteException
      * @throws XMLStreamException
      */
-    protected void writeExtendedAttributes(XMLStreamWriter writer, Extensible extensibleElement, StAXAttributeProcessor extensionAttributeProcessor) throws ContributionWriteException, XMLStreamException {
-        for(Extension extension : extensibleElement.getAttributeExtensions()) {
-            if(extension.isAttribute()) {
+    protected void writeExtendedAttributes(XMLStreamWriter writer,
+                                           Extensible extensibleElement,
+                                           StAXAttributeProcessor extensionAttributeProcessor)
+        throws ContributionWriteException, XMLStreamException {
+        for (Extension extension : extensibleElement.getAttributeExtensions()) {
+            if (extension.isAttribute()) {
                 extensionAttributeProcessor.write(extension, writer);
             }
         }
     }
-    
-    /*protected void validatePolicySets(PolicySetAttachPoint policySetAttachPoint) 
+
+    /*protected void validatePolicySets(PolicySubject policySetAttachPoint) 
                                                             throws ContributionResolveException {
         validatePolicySets(policySetAttachPoint, policySetAttachPoint.getApplicablePolicySets());
     }
      
     
-    protected void validatePolicySets(PolicySetAttachPoint policySetAttachPoint,
+    protected void validatePolicySets(PolicySubject policySetAttachPoint,
                                       List<PolicySet> applicablePolicySets) throws ContributionResolveException {
         //Since the applicablePolicySets in a policySetAttachPoint will already have the 
         //list of policysets that might ever be applicable to this attachPoint, just check
         //if the defined policysets feature in the list of applicable policysets
-        IntentAttachPointType attachPointType = policySetAttachPoint.getType();
+        ExtensionType attachPointType = policySetAttachPoint.getType();
         for ( PolicySet definedPolicySet : policySetAttachPoint.getPolicySets() ) {
             if ( !definedPolicySet.isUnresolved() ) {
                 if ( !applicablePolicySets.contains(definedPolicySet)) {

Modified: tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java?rev=746356&r1=746355&r2=746356&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java Fri Feb 20 20:10:37 2009
@@ -63,8 +63,7 @@
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
 import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.IntentAttachPoint;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
+import org.apache.tuscany.sca.policy.PolicySubject;
 import org.w3c.dom.Document;
 
 /**
@@ -347,13 +346,13 @@
         // Write <implementation> elements if the componentType has
         // any intents or policySets
         boolean writeImplementation = false;
-        if (componentType instanceof IntentAttachPoint) {
-            if (!((IntentAttachPoint)componentType).getRequiredIntents().isEmpty()) {
+        if (componentType instanceof PolicySubject) {
+            if (!((PolicySubject)componentType).getRequiredIntents().isEmpty()) {
                 writeImplementation = true;
             }
         }
-        if (componentType instanceof PolicySetAttachPoint) {
-            if (!((PolicySetAttachPoint)componentType).getPolicySets().isEmpty()) {
+        if (componentType instanceof PolicySubject) {
+            if (!((PolicySubject)componentType).getPolicySets().isEmpty()) {
                 writeImplementation = true;
             }
         }
@@ -370,10 +369,6 @@
         // Resolve component type services and references
         resolveContracts(componentType.getServices(), resolver);
         resolveContracts(componentType.getReferences(), resolver);
-        if ( componentType instanceof PolicySetAttachPoint ) {
-            resolveIntents(((PolicySetAttachPoint)componentType).getRequiredIntents(), resolver);
-            resolvePolicySets(((PolicySetAttachPoint)componentType).getPolicySets(), resolver);
-        }
     }
     
     public QName getArtifactType() {

Modified: tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java?rev=746356&r1=746355&r2=746356&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java Fri Feb 20 20:10:37 2009
@@ -38,7 +38,6 @@
 import static org.apache.tuscany.sca.assembly.xml.Constants.MANY;
 import static org.apache.tuscany.sca.assembly.xml.Constants.MUST_SUPPLY;
 import static org.apache.tuscany.sca.assembly.xml.Constants.NAME;
-import static org.apache.tuscany.sca.assembly.xml.Constants.OPERATION_QNAME;
 import static org.apache.tuscany.sca.assembly.xml.Constants.PROMOTE;
 import static org.apache.tuscany.sca.assembly.xml.Constants.PROPERTY;
 import static org.apache.tuscany.sca.assembly.xml.Constants.PROPERTY_QNAME;
@@ -57,7 +56,6 @@
 import static org.apache.tuscany.sca.assembly.xml.Constants.WIRE_QNAME;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
 
@@ -79,11 +77,9 @@
 import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.assembly.CompositeReference;
 import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.ConfiguredOperation;
 import org.apache.tuscany.sca.assembly.ConstrainingType;
 import org.apache.tuscany.sca.assembly.Contract;
 import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.OperationsConfigurator;
 import org.apache.tuscany.sca.assembly.Property;
 import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.assembly.Service;
@@ -103,14 +99,9 @@
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.util.PolicyComputationUtils;
-import org.apache.tuscany.sca.policy.util.PolicyValidationException;
-import org.apache.tuscany.sca.policy.util.PolicyValidationUtils;
+import org.apache.tuscany.sca.policy.ExtensionType;
+import org.apache.tuscany.sca.policy.PolicyFactory;
+import org.apache.tuscany.sca.policy.PolicySubject;
 import org.w3c.dom.Document;
 
 /**
@@ -120,7 +111,7 @@
  */
 public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArtifactProcessor<Composite> {
     private XPathFactory xPathFactory;
-    private IntentAttachPointTypeFactory intentAttachPointTypeFactory;
+    private PolicyFactory intentAttachPointTypeFactory;
     private StAXAttributeProcessor<Object> extensionAttributeProcessor;
     private ContributionFactory contributionFactory;
 
@@ -157,7 +148,7 @@
              Monitor monitor) {
         
     	super(modelFactories, extensionProcessor, monitor);
-        this.intentAttachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
+        this.intentAttachPointTypeFactory = modelFactories.getFactory(PolicyFactory.class);
         this.xPathFactory = modelFactories.getFactory(XPathFactory.class);
         this.contributionFactory = modelFactories.getFactory(ContributionFactory.class);
         this.extensionAttributeProcessor = extensionAttributeProcessor;
@@ -433,30 +424,6 @@
                             
                             policyProcessor.readPolicies(callback, reader);
     
-                        } else if (OPERATION_QNAME.equals(name)) {
-    
-                            // Read an <operation>
-                            ConfiguredOperation operation = assemblyFactory.createConfiguredOperation();
-                            operation.setName(getString(reader, NAME));
-                            operation.setUnresolved(true);
-                            if (callback != null) {
-                                policyProcessor.readPolicies(operation, reader);
-                            } else {
-                                policyProcessor.readPolicies(operation, reader);
-                            }
-                            
-                            OperationsConfigurator opConfigurator = null;
-                            if ( compositeService != null ) {
-                                opConfigurator = compositeService;
-                            } else if ( componentService != null ) {
-                                opConfigurator = componentService;
-                            } else if ( compositeReference != null ) {
-                                opConfigurator = compositeReference;
-                            } else if ( componentReference != null ) {
-                                opConfigurator = componentReference;
-                            }
-                            
-                            opConfigurator.getConfiguredOperations().add(operation);
                         } else if (IMPLEMENTATION_COMPOSITE_QNAME.equals(name)) {
     
                             // Read an implementation.composite
@@ -489,11 +456,11 @@
                                         }
                                     }
                                 } else if (extension instanceof Binding) {
-                                    if ( extension instanceof PolicySetAttachPoint ) {
-                                        IntentAttachPointType bindingType = intentAttachPointTypeFactory.createBindingType();
-                                        bindingType.setName(name);
+                                    if ( extension instanceof PolicySubject ) {
+                                        ExtensionType bindingType = intentAttachPointTypeFactory.createBindingType();
+                                        bindingType.setType(name);
                                         bindingType.setUnresolved(true);
-                                        ((PolicySetAttachPoint)extension).setType(bindingType);
+                                        ((PolicySubject)extension).setType(bindingType);
                                     }
                                     // <service><binding> and
                                     // <reference><binding>
@@ -513,11 +480,11 @@
                                     }
     
                                 } else if (extension instanceof Implementation) {
-                                    if ( extension instanceof PolicySetAttachPoint ) {
-                                        IntentAttachPointType implType = intentAttachPointTypeFactory.createImplementationType();
-                                        implType.setName(name);
+                                    if ( extension instanceof PolicySubject ) {
+                                        ExtensionType implType = intentAttachPointTypeFactory.createImplementationType();
+                                        implType.setType(name);
                                         implType.setUnresolved(true);
-                                        ((PolicySetAttachPoint)extension).setType(implType);
+                                        ((PolicySubject)extension).setType(implType);
                                     }
                                     // <component><implementation>
                                     if (component != null) {
@@ -960,17 +927,6 @@
                 extensionProcessor.resolve(extension, resolver);
             }
         }
-        
-        //resolve intents and policy sets
-        List<Intent> compositeIntents = null;
-        List<PolicySet> compositePolicySets = null;
-        List<PolicySet> compositeApplicablePolicySets = null;
-        resolveIntents(composite.getRequiredIntents(), resolver);
-        resolvePolicySets(composite.getPolicySets(), resolver);
-        resolvePolicySets(composite.getApplicablePolicySets(), resolver);
-        compositeIntents = composite.getRequiredIntents();
-        compositePolicySets = composite.getPolicySets();
-        compositeApplicablePolicySets = composite.getApplicablePolicySets();
 
         //Resolve composite services and references
         resolveContracts(composite, composite.getServices(), resolver);
@@ -984,19 +940,6 @@
                 component.setConstrainingType(constrainingType);
             }
             
-            //resolve intents and policy sets
-            resolveIntents(component.getRequiredIntents(), resolver);
-            resolvePolicySets(component.getPolicySets(), resolver);
-            resolvePolicySets(component.getApplicablePolicySets(), resolver);
-            
-            //inherit composite intents and policysets
-            PolicyComputationUtils.addDefaultPolicies(compositeIntents,
-                                                      compositePolicySets,
-                                                      component.getRequiredIntents(),
-                                                      component.getPolicySets());
-
-            addInheritedPolicySets(compositeApplicablePolicySets, component.getApplicablePolicySets());
-
             //resolve component services and references 
             resolveContracts(component, component.getServices(), resolver);
             resolveContracts(component, component.getReferences(), resolver);
@@ -1015,35 +958,12 @@
             //resolve component implementation
             Implementation implementation = component.getImplementation();
             if (implementation != null) {
-                try {
-                    //resolve intents and policysets specified on this implementation
-                    //before copying them over to the component.  Before that, from the component
-                    //copy over the applicablePolicySets alone as it might have to be
-                    //used to validate the policysets specified on the implementation
-                    
-                    resolveImplIntentsAndPolicySets(implementation, 
-                                                    component.getApplicablePolicySets(), 
-                                                    resolver);
+                //now resolve the implementation so that even if there is a shared instance
+                //for this that is resolved, the specified intents and policysets are safe in the
+                //component and not lost
+                implementation = resolveImplementation(implementation, resolver);
 
-                    copyPoliciesToComponent(component, implementation, resolver, true);
-                    
-                    //now resolve the implementation so that even if there is a shared instance
-                    //for this that is resolved, the specified intents and policysets are safe in the
-                    //component and not lost
-                    implementation = resolveImplementation(implementation, resolver);
-                    
-                    //resolved implementation may contain intents and policysets specified at 
-                    //componentType (either in the componentType side file or in annotations if its a 
-                    //java implementation).  This has to be consolidated in to the component.
-                    copyPoliciesToComponent(component, implementation, resolver, false);
-                    
-                    component.setImplementation(implementation);
-                } catch ( PolicyValidationException e ) {
-                	error("PolicyImplValidationException", resolver, component.getName(), e.getMessage());
-                    //throw new ContributionResolveException("PolicyValidation exception when processing implementation of component '" 
-                                                           //+ component.getName() + "' due to " + e.getMessage(), e);
-                }
-            
+                component.setImplementation(implementation);
             }
 
             //add model resolver to component
@@ -1062,154 +982,6 @@
         }
     }
     
-    private void resolveImplIntentsAndPolicySets(Implementation implementation,
-                                                 List<PolicySet> inheritedApplicablePolicySets,
-                                                 ModelResolver resolver) throws ContributionResolveException,
-                                                                                 PolicyValidationException
-                                                        {
-        if ( implementation instanceof PolicySetAttachPoint ) {
-            PolicySetAttachPoint policiedImpl = (PolicySetAttachPoint)implementation;
-            
-            policiedImpl.getApplicablePolicySets().addAll(inheritedApplicablePolicySets);
-            
-            resolveIntents(policiedImpl.getRequiredIntents(), resolver);
-            PolicyValidationUtils.validateIntents(policiedImpl, policiedImpl.getType());
-            
-            resolvePolicySets(policiedImpl.getPolicySets(), resolver);
-            resolvePolicySets(policiedImpl.getApplicablePolicySets(), resolver);
-            
-            PolicyValidationUtils.validatePolicySets(policiedImpl);
-            
-            if ( implementation instanceof OperationsConfigurator ) {
-                for ( ConfiguredOperation implConfOp : ((OperationsConfigurator)implementation).getConfiguredOperations() ) {
-                    resolveIntents(implConfOp.getRequiredIntents(), resolver);
-                    PolicyValidationUtils.validateIntents(implConfOp, policiedImpl.getType());
-                    
-                    resolvePolicySets(implConfOp.getPolicySets(), resolver);
-                    resolvePolicySets(implConfOp.getApplicablePolicySets(), resolver);
-                    //add the inherited applicablePolicysets
-                    addInheritedPolicySets(policiedImpl.getApplicablePolicySets(), implConfOp.getApplicablePolicySets());
-                    
-                    PolicyValidationUtils.validatePolicySets(implConfOp, policiedImpl.getType());
-                    
-                    PolicyComputationUtils.addDefaultPolicies(
-                                            ((PolicySetAttachPoint)implementation).getRequiredIntents(),
-                                            ((PolicySetAttachPoint)implementation).getPolicySets(),
-                                            implConfOp.getRequiredIntents(),
-                                            implConfOp.getPolicySets());
-                }
-            }
-        }
-    }
-    
-    private void copyPoliciesToComponent(Component component, 
-                                         Implementation implementation, 
-                                         ModelResolver resolver,
-                                         boolean clearImplSettings) throws ContributionResolveException {
-        if (implementation instanceof PolicySetAttachPoint) {
-            // Add implementation policies into component, since implementation instances are 
-            // reused and it's likely that this implementation instance will not hold after its resolution.
-            // On the first call to this method (clearImplSettings=true), we are moving policies from the
-            // implementation XML element up to the component.  In this case if there are mutually exclusive
-            // policies we must clear the component policy so that the implementation policy "wins".
-            // On the second call to this method (clearImplSettings=false), we are moving policies from the
-            // componentType implementation up to the component.  In this case if there are mutually
-            // exclusive policies it is an error.  This error will be detected later in the PolicyComputer.
-            if (clearImplSettings) {
-                for (Intent intent : ((PolicySetAttachPoint)implementation).getRequiredIntents()) {
-                    for (Intent excluded : intent.getExcludedIntents()) {
-                        if (component.getRequiredIntents().contains(excluded)) {
-                            component.getRequiredIntents().remove(excluded);
-                        }
-                        for (Iterator<PolicySet> i = component.getPolicySets().iterator(); i.hasNext(); ) {
-                            PolicySet cmpPolicySet = i.next();
-                            if (cmpPolicySet.getProvidedIntents().contains(excluded)) {
-                                i.remove();
-                            }
-                        }
-                    }
-                }
-                for (PolicySet policySet : ((PolicySetAttachPoint)implementation).getPolicySets()) {
-                    for (Intent intent : policySet.getProvidedIntents()) {
-                        for (Intent excluded : intent.getExcludedIntents()) {
-                            if (component.getRequiredIntents().contains(excluded)) {
-                                component.getRequiredIntents().remove(excluded);
-                            }
-                            for (Iterator<PolicySet> i = component.getPolicySets().iterator(); i.hasNext(); ) {
-                                PolicySet cmpPolicySet = i.next();
-                                if (cmpPolicySet.getProvidedIntents().contains(excluded)) {
-                                    i.remove();
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            component.getRequiredIntents().addAll(((PolicySetAttachPoint)implementation).getRequiredIntents());
-            component.getPolicySets().addAll(((PolicySetAttachPoint)implementation).getPolicySets());
-            component.getApplicablePolicySets().addAll(((PolicySetAttachPoint)implementation).getApplicablePolicySets());
-            
-            if ( implementation instanceof OperationsConfigurator ) {
-                boolean notFound;
-                List<ConfiguredOperation> opsFromImplementation = new ArrayList<ConfiguredOperation>();
-                List<ConfiguredOperation> implConfOperations = 
-                    new ArrayList<ConfiguredOperation>(((OperationsConfigurator)implementation).getConfiguredOperations());
-                for ( ConfiguredOperation implConfOp : implConfOperations ) {
-                    notFound = true;
-                    for ( ConfiguredOperation compConfOp : ((OperationsConfigurator)component).getConfiguredOperations() ) {
-                        if ( implConfOp.getName().equals(compConfOp.getName()) ) {
-                            notFound = false;
-
-                            if (clearImplSettings) {
-                                for (Intent intent : implConfOp.getRequiredIntents()) {
-                                    for (Intent excluded : intent.getExcludedIntents()) {
-                                        if (compConfOp.getRequiredIntents().contains(excluded)) {
-                                            compConfOp.getRequiredIntents().remove(excluded);
-                                        }
-                                    }
-                                }
-                                for (PolicySet policySet : implConfOp.getPolicySets()) {
-                                    for (Intent intent : policySet.getProvidedIntents()) {
-                                        for (Intent excluded : intent.getExcludedIntents()) {
-                                            if (compConfOp.getRequiredIntents().contains(excluded)) {
-                                                compConfOp.getRequiredIntents().remove(excluded);
-                                            }
-                                            for (Iterator<PolicySet> i = compConfOp.getPolicySets().iterator(); i.hasNext(); ) {
-                                                PolicySet cmpPolicySet = i.next();
-                                                if (cmpPolicySet.getProvidedIntents().contains(excluded)) {
-                                                    i.remove();
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-
-                            addInheritedIntents(implConfOp.getRequiredIntents(), compConfOp.getRequiredIntents());
-                            addInheritedPolicySets(implConfOp.getPolicySets(), compConfOp.getPolicySets());
-                            addInheritedPolicySets(implConfOp.getApplicablePolicySets(), compConfOp.getApplicablePolicySets());
-                        }
-                    }
-                    
-                    if ( notFound ) {
-                        opsFromImplementation.add(implConfOp);
-                    }
-                    
-                    if ( clearImplSettings ) {
-                        ((OperationsConfigurator)implementation).getConfiguredOperations().remove(implConfOp);
-                    }
-                }
-                ((OperationsConfigurator)component).getConfiguredOperations().addAll(opsFromImplementation);
-            }
-            
-            if ( clearImplSettings ) {
-                ((PolicySetAttachPoint)implementation).getRequiredIntents().clear();
-                ((PolicySetAttachPoint)implementation).getPolicySets().clear();
-            }
-        }
-    }
-    
-    
     public QName getArtifactType() {
         return COMPOSITE_QNAME;
     }

Modified: tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java?rev=746356&r1=746355&r2=746356&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java Fri Feb 20 20:10:37 2009
@@ -261,15 +261,6 @@
         // Resolve component type services and references
         resolveAbstractContracts(constrainingType.getServices(), resolver);
         resolveAbstractContracts(constrainingType.getReferences(), resolver);
-        
-        resolveIntents(constrainingType.getRequiredIntents(), resolver);
-        for ( AbstractService service  : constrainingType.getServices() ) {
-            resolveIntents(service.getRequiredIntents(), resolver);
-        }
-        
-        for ( AbstractReference reference : constrainingType.getReferences() ) {
-            resolveIntents(reference.getRequiredIntents(), resolver);
-        }
     }
     
     public QName getArtifactType() {

Modified: tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java?rev=746356&r1=746355&r2=746356&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java Fri Feb 20 20:10:37 2009
@@ -42,7 +42,7 @@
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
+import org.apache.tuscany.sca.policy.PolicySubject;
 
 /**
  * Default Model Processor for beans.
@@ -220,10 +220,10 @@
                         implementation.getProperties().addAll(componentType.getProperties());
                         implementation.setConstrainingType(componentType.getConstrainingType());
                         
-                        if (implementation instanceof PolicySetAttachPoint &&
-                                componentType instanceof PolicySetAttachPoint ) {
-                            PolicySetAttachPoint policiedImpl = (PolicySetAttachPoint)implementation;
-                            PolicySetAttachPoint policiedCompType = (PolicySetAttachPoint)componentType;
+                        if (implementation instanceof PolicySubject &&
+                                componentType instanceof PolicySubject ) {
+                            PolicySubject policiedImpl = (PolicySubject)implementation;
+                            PolicySubject policiedCompType = (PolicySubject)componentType;
                             
                             if ( policiedImpl.getPolicySets() != null) {
                                 policiedImpl.getPolicySets().addAll(policiedCompType.getPolicySets());



Mime
View raw message