You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/10/15 00:06:33 UTC
svn commit: r704715 [1/2] - in /tuscany/branches/sca-equinox:
itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/
itest/validation/src/test/java/domain/
modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/
modules/assem...
Author: rfeng
Date: Tue Oct 14 15:06:31 2008
New Revision: 704715
URL: http://svn.apache.org/viewvc?rev=704715&view=rev
Log:
Remove SCA prefix from Defintions model
Added:
tuscany/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider (props changed)
- copied unchanged from r704290, tuscany/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider (props changed)
- copied unchanged from r704290, tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java (contents, props changed)
- copied, changed from r704290, tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java (contents, props changed)
- copied, changed from r704290, tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java (contents, props changed)
- copied, changed from r704290, tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java (contents, props changed)
- copied, changed from r704290, tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
tuscany/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint (contents, props changed)
- copied, changed from r704290, tuscany/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java (contents, props changed)
- copied, changed from r704653, tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java (contents, props changed)
- copied, changed from r704653, tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java (contents, props changed)
- copied, changed from r704290, tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java (contents, props changed)
- copied, changed from r704290, tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java (contents, props changed)
- copied, changed from r704290, tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderImpl.java (contents, props changed)
- copied, changed from r704290, tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java (contents, props changed)
- copied, changed from r704290, tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java (contents, props changed)
- copied, changed from r704290, tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
tuscany/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider (props changed)
- copied unchanged from r704290, tuscany/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
tuscany/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider (props changed)
- copied unchanged from r704290, tuscany/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
tuscany/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider (props changed)
- copied unchanged from r704290, tuscany/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
Removed:
tuscany/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
tuscany/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
tuscany/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
tuscany/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
tuscany/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
Modified:
tuscany/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
tuscany/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
tuscany/branches/sca-equinox/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
tuscany/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
tuscany/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
tuscany/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
tuscany/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
tuscany/branches/sca-equinox/modules/extensibility/pom.xml
tuscany/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
tuscany/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
tuscany/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
tuscany/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
tuscany/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Echo.java
tuscany/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface1.java
tuscany/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface2.java
Modified: tuscany/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java (original)
+++ tuscany/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java Tue Oct 14 15:06:31 2008
@@ -28,7 +28,7 @@
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
@@ -113,7 +113,7 @@
return "org.apache.tuscany.sca.assembly.builder.CompositeBuilderNonWiring";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
// Collect and fuse includes
compositeIncludeBuilder.build(composite, definitions, monitor);
Modified: tuscany/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java (original)
+++ tuscany/branches/sca-equinox/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java Tue Oct 14 15:06:31 2008
@@ -52,7 +52,7 @@
import org.apache.tuscany.sca.core.ModuleActivator;
import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
@@ -73,7 +73,7 @@
private ContributionBuilder contributionDependencyBuilder;
private CompositeBuilder domainCompositeBuilder;
private static Workspace workspace;
- private List<SCADefinitions> policyDefinitions;
+ private List<Definitions> policyDefinitions;
private Monitor monitor;
private Composite domainComposite;
private boolean nonWiring;
Modified: tuscany/branches/sca-equinox/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/validation/src/test/java/domain/CustomCompositeBuilder.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/validation/src/test/java/domain/CustomCompositeBuilder.java (original)
+++ tuscany/branches/sca-equinox/itest/validation/src/test/java/domain/CustomCompositeBuilder.java Tue Oct 14 15:06:31 2008
@@ -51,7 +51,7 @@
import org.apache.tuscany.sca.core.ModuleActivator;
import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
import org.apache.tuscany.sca.implementation.node.builder.impl.NodeCompositeBuilderImpl;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
@@ -77,7 +77,7 @@
private NodeImplementationFactory nodeFactory;
//private AtomBindingFactory atomBindingFactory;
private static Workspace workspace;
- private List<SCADefinitions> policyDefinitions;
+ private List<Definitions> policyDefinitions;
private Monitor monitor;
private CustomCompositeBuilder() {
Modified: tuscany/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java Tue Oct 14 15:06:31 2008
@@ -44,7 +44,7 @@
import org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.policy.util.PolicyComputationUtils;
@@ -215,8 +215,8 @@
}
for ( Object object : scaDefnsSink ) {
- if ( object instanceof SCADefinitions ) {
- for ( PolicySet policySet : ((SCADefinitions)object).getPolicySets() ) {
+ if ( object instanceof Definitions ) {
+ for ( PolicySet policySet : ((Definitions)object).getPolicySets() ) {
domainPolicySetMap.put( policySet.getName(), policySet);
}
}
Modified: tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java Tue Oct 14 15:06:31 2008
@@ -45,7 +45,7 @@
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -61,7 +61,7 @@
*/
public class BuildPolicyTestCase {
private static URLArtifactProcessor<Object> documentProcessor;
- private static URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor;
+ private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor;
private static ModelResolver resolver;
private static CompositeBuilder compositeBuilder;
private static Composite composite;
@@ -75,7 +75,7 @@
modelFactories.addFactory(scaBindingFactory);
compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
- List<SCADefinitions> policyDefinitions = new ArrayList<SCADefinitions>();
+ List<Definitions> policyDefinitions = new ArrayList<Definitions>();
resolver = new DefaultModelResolver();
MonitorFactory monitorFactory = new DefaultMonitorFactory();
@@ -86,7 +86,7 @@
URLArtifactProcessorExtensionPoint documentProcessors = new DefaultURLArtifactProcessorExtensionPoint(extensionPoints);
documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);
- policyDefinitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class);
+ policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class);
StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
staxProcessors.addArtifactProcessor(new TestPolicyProcessor());
@@ -104,7 +104,7 @@
url = BuildPolicyTestCase.class.getResource("another_test_definitions.xml");
uri = URI.create("another_test_definitions.xml");
- SCADefinitions definitions = (SCADefinitions)policyDefinitionsProcessor.read(null, uri, url);
+ Definitions definitions = (Definitions)policyDefinitionsProcessor.read(null, uri, url);
assertNotNull(definitions);
policyDefinitions.add(definitions);
Modified: tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java Tue Oct 14 15:06:31 2008
@@ -37,7 +37,7 @@
import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -51,7 +51,7 @@
private static URLArtifactProcessor<Object> documentProcessor;
private static ModelResolver resolver;
- private static URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor;
+ private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor;
@BeforeClass
public static void setUp() throws Exception {
@@ -60,7 +60,7 @@
URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);
- policyDefinitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class);
+ policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class);
// Create StAX processors
StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
@@ -83,7 +83,7 @@
url = getClass().getResource("test_definitions.xml");
uri = URI.create("test_definitions.xml");
- SCADefinitions scaDefns = (SCADefinitions)policyDefinitionsProcessor.read(null, uri, url);
+ Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url);
assertNotNull(scaDefns);
preResolvePolicyTests(composite);
Modified: tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java Tue Oct 14 15:06:31 2008
@@ -44,7 +44,7 @@
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -62,7 +62,7 @@
private static XMLInputFactory inputFactory;
private static StAXArtifactProcessor<Object> staxProcessor;
private static ModelResolver resolver;
- private static URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor;
+ private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor;
private static CompositeBuilder compositeBuilder;
private static Monitor monitor;
@@ -86,7 +86,7 @@
InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
- policyDefinitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class);
+ policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class);
}
@Test
@@ -106,7 +106,7 @@
URL url = getClass().getResource("test_definitions.xml");
URI uri = URI.create("test_definitions.xml");
- SCADefinitions scaDefns = (SCADefinitions)policyDefinitionsProcessor.read(null, uri, url);
+ Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url);
assertNotNull(scaDefns);
policyDefinitionsProcessor.resolve(scaDefns, resolver);
@@ -134,7 +134,7 @@
URL url = getClass().getResource("test_definitions.xml");
URI uri = URI.create("test_definitions.xml");
- SCADefinitions scaDefns = (SCADefinitions)policyDefinitionsProcessor.read(null, uri, url);
+ Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url);
assertNotNull(scaDefns);
policyDefinitionsProcessor.resolve(scaDefns, resolver);
Modified: tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java Tue Oct 14 15:06:31 2008
@@ -47,7 +47,7 @@
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -66,7 +66,7 @@
private static ExtensibleStAXArtifactProcessor staxProcessor;
private static ModelResolver resolver;
private static CompositeBuilder compositeBuilder;
- private static URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor;
+ private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor;
private static Monitor monitor;
@BeforeClass
@@ -90,7 +90,7 @@
monitor = monitorFactory.createMonitor();
URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
- policyDefinitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class);
+ policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class);
}
@Test
@@ -118,7 +118,7 @@
URL url = getClass().getResource("test_definitions.xml");
URI uri = URI.create("test_definitions.xml");
- SCADefinitions scaDefns = (SCADefinitions)policyDefinitionsProcessor.read(null, uri, url);
+ Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url);
assertNotNull(scaDefns);
policyDefinitionsProcessor.resolve(scaDefns, resolver);
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java Tue Oct 14 15:06:31 2008
@@ -20,7 +20,7 @@
package org.apache.tuscany.sca.assembly.builder;
import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
/**
@@ -46,6 +46,6 @@
* @param monitor
* @throws CompositeBuilderException
*/
- void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException;
+ void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException;
}
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java Tue Oct 14 15:06:31 2008
@@ -28,7 +28,7 @@
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
@@ -118,7 +118,7 @@
return id;
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
getBuilder().build(composite, definitions, monitor);
}
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -46,7 +46,7 @@
import org.apache.tuscany.sca.assembly.builder.AutomaticBinding;
import org.apache.tuscany.sca.assembly.builder.ComponentPreProcessor;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -90,7 +90,7 @@
* @param composite
* @param monitor
*/
- protected void configureComponents(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ protected void configureComponents(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
configureComponents(composite, null, definitions, monitor);
configureSourcedProperties(composite, null);
}
@@ -102,7 +102,7 @@
* @param uri
* @param problems
*/
- private void configureComponents(Composite composite, String uri, SCADefinitions definitions, Monitor monitor) {
+ private void configureComponents(Composite composite, String uri, Definitions definitions, Monitor monitor) {
String parentURI = uri;
// Process nested composites recursively
@@ -778,7 +778,7 @@
return null;
}
- private SCABinding createSCABinding(SCADefinitions definitions) {
+ private SCABinding createSCABinding(Definitions definitions) {
SCABinding scaBinding = scaBindingFactory.createSCABinding();
// mark the bindings that are added automatically so that they can
@@ -803,7 +803,7 @@
*
* @param composite the composite to be configured
*/
- protected void configureBindingURIsAndNames(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ protected void configureBindingURIsAndNames(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
configureBindingURIs(composite, null, definitions, null, monitor);
configureBindingNames(composite, monitor);
}
@@ -817,7 +817,7 @@
* @param defaultBindings list of default binding configurations
*/
protected void configureBindingURIs(Composite composite,
- SCADefinitions definitions, List<Binding> defaultBindings,
+ Definitions definitions, List<Binding> defaultBindings,
Monitor monitor) throws CompositeBuilderException {
configureBindingURIs(composite, null, definitions, defaultBindings, monitor);
}
@@ -843,7 +843,7 @@
* @param defaultBindings list of default binding configurations
*/
private void configureBindingURIs(Composite composite, String uri,
- SCADefinitions definitions, List<Binding> defaultBindings,
+ Definitions definitions, List<Binding> defaultBindings,
Monitor monitor) throws CompositeBuilderException {
String parentComponentURI = uri;
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -27,7 +27,7 @@
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -61,7 +61,7 @@
return "org.apache.tuscany.sca.assembly.builder.ComponentConfigurationBuilder";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
configureComponents(composite, definitions, monitor);
}
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -27,7 +27,7 @@
import org.apache.tuscany.sca.assembly.builder.BindingBuilderExtension;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
/**
@@ -41,7 +41,7 @@
public ComponentReferenceBindingBuilderImpl() {
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
buildReferenceBindings(composite, monitor);
}
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -35,7 +35,7 @@
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
/**
@@ -52,7 +52,7 @@
this.endpointFactory = endpointFactory;
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
wireCompositeReferences(composite, monitor);
}
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -24,7 +24,7 @@
import org.apache.tuscany.sca.assembly.EndpointFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -43,7 +43,7 @@
return "org.apache.tuscany.sca.assembly.builder.ComponentReferenceWireBuilder";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
wireComponentReferences(composite, monitor);
}
}
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -28,7 +28,7 @@
import org.apache.tuscany.sca.assembly.builder.BindingBuilderExtension;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
/**
@@ -46,7 +46,7 @@
return "org.apache.tuscany.sca.assembly.builder.ComponentServiceBindingBuilder";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
buildServiceBindings(composite, monitor);
}
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -28,7 +28,7 @@
import org.apache.tuscany.sca.assembly.Implementation;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
/**
@@ -47,7 +47,7 @@
return "org.apache.tuscany.sca.assembly.builder.ComponentServicePromotionBuilder";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
// Process nested composites recursively
configureNestedCompositeServices(composite);
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -28,7 +28,7 @@
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -60,7 +60,7 @@
return "org.apache.tuscany.sca.assembly.builder.CompositeServiceBindingBuilder";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
List<Binding> defaultBindings = null;
for (Object x: composite.getExtensions()) {
if (x instanceof List) {
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -27,7 +27,7 @@
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -60,7 +60,7 @@
return "org.apache.tuscany.sca.assembly.builder.CompositeBindingURIBuilder";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
configureBindingURIsAndNames(composite, definitions, monitor);
}
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -31,7 +31,7 @@
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
@@ -176,7 +176,7 @@
return "org.apache.tuscany.sca.assembly.builder.CompositeBuilder";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
// Collect and fuse includes
compositeIncludeBuilder.build(composite, definitions, monitor);
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -28,7 +28,7 @@
import org.apache.tuscany.sca.assembly.Implementation;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
/**
@@ -41,7 +41,7 @@
public CompositeCloneBuilderImpl() {
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
expandCompositeImplementations(composite);
}
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -28,7 +28,7 @@
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
@@ -51,7 +51,7 @@
return "org.apache.tuscany.sca.assembly.builder.CompositeIncludeBuilder";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
fuseIncludes(composite, monitor);
}
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -25,7 +25,7 @@
import org.apache.tuscany.sca.assembly.EndpointFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -46,7 +46,7 @@
return "org.apache.tuscany.sca.assembly.builder.CompositePolicyBuilder";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
computePolicies(composite, monitor);
}
}
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -25,7 +25,7 @@
import org.apache.tuscany.sca.assembly.EndpointFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -45,7 +45,7 @@
return "org.apache.tuscany.sca.assembly.builder.CompositePromotionBuilder";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
connectCompositeReferencesAndServices(composite, monitor);
}
}
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -31,7 +31,7 @@
import org.apache.tuscany.sca.assembly.builder.AutomaticBinding;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
/**
@@ -50,7 +50,7 @@
return "org.apache.tuscany.sca.assembly.builder.CompositeReferenceConfigurationBuilder";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
// Process nested composites recursively
configureNestedCompositeReferences(composite);
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -30,7 +30,7 @@
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
/**
@@ -56,7 +56,7 @@
*
* @param composite
*/
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
// Process composite references declared in this composite
for (Reference reference : composite.getReferences()) {
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -28,7 +28,7 @@
import org.apache.tuscany.sca.assembly.builder.BindingBuilderExtension;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
/**
@@ -46,7 +46,7 @@
return "org.apache.tuscany.sca.assembly.builder.CompositeServiceBindingBuilder";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
buildServiceBindings(composite, monitor);
}
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -31,7 +31,7 @@
import org.apache.tuscany.sca.assembly.builder.AutomaticBinding;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
/**
@@ -50,7 +50,7 @@
return "org.apache.tuscany.sca.assembly.builder.CompositeServiceConfigurationBuilder";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
// Process nested composites recursively
configureNestedCompositeServices(composite);
Modified: tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -27,7 +27,7 @@
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
/**
@@ -46,7 +46,7 @@
return "org.apache.tuscany.sca.assembly.builder.CompositeServicePromotionBuilder";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
// Process top level composite services
for (Service service : composite.getServices()) {
Modified: tuscany/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java Tue Oct 14 15:06:31 2008
@@ -29,25 +29,25 @@
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderException;
+import org.apache.tuscany.sca.definitions.Definitions;
+import org.apache.tuscany.sca.provider.DefinitionsProvider;
+import org.apache.tuscany.sca.provider.DefinitionsProviderException;
/**
* Provider for Policy Intents and PolicySet definitions related to security
*
* @version $Rev$ $Date$
*/
-public class SCABindingDefinitionsProvider implements SCADefinitionsProvider {
+public class SCABindingDefinitionsProvider implements DefinitionsProvider {
private String definitionsFile = "org/apache/tuscany/sca/binding/sca/definitions.xml";
URLArtifactProcessor urlArtifactProcessor = null;
public SCABindingDefinitionsProvider(ExtensionPointRegistry registry) {
URLArtifactProcessorExtensionPoint documentProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
- urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(SCADefinitions.class);
+ urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(Definitions.class);
}
- public SCADefinitions getSCADefinition() throws SCADefinitionsProviderException {
+ public Definitions getDefinitions() throws DefinitionsProviderException {
// Allow privileged access to load resource. Requires RuntimePermssion in security policy.
final URL definitionsFileUrl = AccessController.doPrivileged(new PrivilegedAction<URL>() {
public URL run() {
@@ -55,17 +55,17 @@
}
});
- SCADefinitions scaDefn = null;
+ Definitions scaDefn = null;
try {
final URI uri = new URI(definitionsFile);
// Allow bindings to read properties. Requires PropertyPermission read in security policy.
- scaDefn = AccessController.doPrivileged(new PrivilegedExceptionAction<SCADefinitions>() {
- public SCADefinitions run() throws ContributionReadException {
- return (SCADefinitions)urlArtifactProcessor.read(null, uri, definitionsFileUrl);
+ scaDefn = AccessController.doPrivileged(new PrivilegedExceptionAction<Definitions>() {
+ public Definitions run() throws ContributionReadException {
+ return (Definitions)urlArtifactProcessor.read(null, uri, definitionsFileUrl);
}
});
} catch (Exception e) {
- throw new SCADefinitionsProviderException(e);
+ throw new DefinitionsProviderException(e);
}
return scaDefn;
}
Propchange: tuscany/branches/sca-equinox/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider:671193
+/tuscany/java/sca/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider:694855
Modified: tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/WSBindingDefinitionsProvider.java Tue Oct 14 15:06:31 2008
@@ -28,37 +28,37 @@
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderException;
+import org.apache.tuscany.sca.definitions.Definitions;
+import org.apache.tuscany.sca.provider.DefinitionsProvider;
+import org.apache.tuscany.sca.provider.DefinitionsProviderException;
/**
* Provider for Policy Intents and PolicySet definitions related to security
*
* @version $Rev$ $Date$
*/
-public class WSBindingDefinitionsProvider implements SCADefinitionsProvider {
+public class WSBindingDefinitionsProvider implements DefinitionsProvider {
private String definitionsFile = "org/apache/tuscany/sca/binding/ws/axis2/definitions.xml";
URLArtifactProcessor urlArtifactProcessor = null;
public WSBindingDefinitionsProvider(ExtensionPointRegistry registry) {
URLArtifactProcessorExtensionPoint documentProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
- urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(SCADefinitions.class);
+ urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(Definitions.class);
}
- public SCADefinitions getSCADefinition() throws SCADefinitionsProviderException {
+ public Definitions getDefinitions() throws DefinitionsProviderException {
final URL definitionsFileUrl = getClass().getClassLoader().getResource(definitionsFile);
- SCADefinitions scaDefn = null;
+ Definitions scaDefn = null;
try {
final URI uri = new URI(definitionsFile);
// Allow bindings to read properties. Requires PropertyPermission read in security policy.
- scaDefn = AccessController.doPrivileged(new PrivilegedExceptionAction<SCADefinitions>() {
- public SCADefinitions run() throws ContributionReadException {
- return (SCADefinitions)urlArtifactProcessor.read(null, uri, definitionsFileUrl);
+ scaDefn = AccessController.doPrivileged(new PrivilegedExceptionAction<Definitions>() {
+ public Definitions run() throws ContributionReadException {
+ return (Definitions)urlArtifactProcessor.read(null, uri, definitionsFileUrl);
}
});
} catch (Exception e) {
- throw new SCADefinitionsProviderException(e);
+ throw new DefinitionsProviderException(e);
}
return scaDefn;
}
Propchange: tuscany/branches/sca-equinox/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider:671193
+/tuscany/java/sca/modules/binding-ws-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider:694855
Copied: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java (from r704290, tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java?p2=tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java&p1=tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java&r1=704290&r2=704715&rev=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java (original)
+++ tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java Tue Oct 14 15:06:31 2008
@@ -33,26 +33,26 @@
*
* @version $Rev$ $Date$
*/
-public class DefaultSCADefinitionsProviderExtensionPoint implements
- SCADefinitionsProviderExtensionPoint {
+public class DefaultDefinitionsProviderExtensionPoint implements
+ DefinitionsProviderExtensionPoint {
private ExtensionPointRegistry extensionPointRegistry = null;
- private List<SCADefinitionsProvider> scaDefnsProviders = new ArrayList<SCADefinitionsProvider>();
+ private List<DefinitionsProvider> scaDefnsProviders = new ArrayList<DefinitionsProvider>();
- public DefaultSCADefinitionsProviderExtensionPoint(ExtensionPointRegistry extnPtReg) {
+ public DefaultDefinitionsProviderExtensionPoint(ExtensionPointRegistry extnPtReg) {
this.extensionPointRegistry = extnPtReg;
}
- public void addSCADefinitionsProvider(SCADefinitionsProvider provider) {
+ public void addDefinitionsProvider(DefinitionsProvider provider) {
scaDefnsProviders.add(provider);
}
- public void removeSCADefinitionsProvider(SCADefinitionsProvider provider) {
+ public void removeDefinitionsProvider(DefinitionsProvider provider) {
scaDefnsProviders.remove(provider);
}
- public List<SCADefinitionsProvider> getSCADefinitionsProviders() {
+ public List<DefinitionsProvider> getDefinitionsProviders() {
if (scaDefnsProviders.isEmpty()) {
loadProviders();
}
@@ -62,23 +62,23 @@
private void loadProviders() {
// Get the provider service declarations
Set<ServiceDeclaration> defnProviderDecls;
- SCADefinitionsProvider aProvider = null;
+ DefinitionsProvider aProvider = null;
Class providerClass = null;
Constructor constructor = null;
try {
defnProviderDecls =
- ServiceDiscovery.getInstance().getServiceDeclarations(SCADefinitionsProvider.class.getName());
+ ServiceDiscovery.getInstance().getServiceDeclarations(DefinitionsProvider.class.getName());
for (ServiceDeclaration aDefnProviderDecl : defnProviderDecls) {
providerClass = aDefnProviderDecl.loadClass();
try {
constructor = providerClass.getConstructor();
- aProvider = (SCADefinitionsProvider)constructor.newInstance();
+ aProvider = (DefinitionsProvider)constructor.newInstance();
} catch (NoSuchMethodException e1) {
constructor = providerClass.getConstructor(ExtensionPointRegistry.class);
- aProvider = (SCADefinitionsProvider)constructor.newInstance(extensionPointRegistry);
+ aProvider = (DefinitionsProvider)constructor.newInstance(extensionPointRegistry);
}
scaDefnsProviders.add(aProvider);
Propchange: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultDefinitionsProviderExtensionPoint.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java:671193
+/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java:694855
Copied: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java (from r704290, tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java?p2=tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java&p1=tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java&r1=704290&r2=704715&rev=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java (original)
+++ tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java Tue Oct 14 15:06:31 2008
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.provider;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
/**
* Models a provider of SCA Definitions. Typically SCA Definitions providers
@@ -28,6 +28,6 @@
*
* @version $Rev$ $Date$
*/
-public interface SCADefinitionsProvider {
- SCADefinitions getSCADefinition() throws SCADefinitionsProviderException ;
+public interface DefinitionsProvider {
+ Definitions getDefinitions() throws DefinitionsProviderException ;
}
Propchange: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProvider.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java:671193
+/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java:694855
Copied: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java (from r704290, tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java?p2=tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java&p1=tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java&r1=704290&r2=704715&rev=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java (original)
+++ tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java Tue Oct 14 15:06:31 2008
@@ -22,9 +22,9 @@
/**
* @version $Rev$ $Date$
*/
-public class SCADefinitionsProviderException extends Exception {
+public class DefinitionsProviderException extends Exception {
- public SCADefinitionsProviderException(Throwable e) {
+ public DefinitionsProviderException(Throwable e) {
super(e);
}
}
Propchange: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java:671193
+/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java:694855