You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/05/16 08:20:41 UTC
svn commit: r538445 [1/2] - in /incubator/tuscany/java/sca:
itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/
modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/
modules/assembly/src/main/java/org/apache/tus...
Author: jsdelfino
Date: Tue May 15 23:20:37 2007
New Revision: 538445
URL: http://svn.apache.org/viewvc?view=rev&rev=538445
Log:
Cleaned up implementation classes to avoid confusion with SPIs
Added:
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java (with props)
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
- copied, changed from r538415, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DefaultCompositeBuilder.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java (with props)
incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/
incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java (with props)
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
- copied, changed from r538423, incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultWireProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java (with props)
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java
- copied, changed from r538423, incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultCompositeActivator.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
- copied, changed from r538415, incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkEvent.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
- copied, changed from r538415, incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkItem.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java (with props)
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
- copied, changed from r538415, incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DefaultMediator.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/ExceptionFormatterImpl.java
- copied, changed from r538415, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/DefaultExceptionFormatter.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/monitor/ExceptionFormatterTestCase.java
- copied, changed from r538415, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/monitor/DefaultExceptionFormatterTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/monitor/JavaLoggingTestCase.java
- copied, changed from r538415, incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/monitor/JavaLoggingTestCaseFIXME.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java (with props)
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/TestModelResolver.java (with props)
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
- copied, changed from r538415, incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DefaultInterfaceContractMapper.java
Removed:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DefaultCompositeBuilder.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
incubator/tuscany/java/sca/modules/contribution/src/test/java/org/
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultWireProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultCompositeActivator.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkEvent.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkItem.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DefaultMediator.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/DefaultExceptionFormatter.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/monitor/DefaultExceptionFormatterTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/monitor/JavaLoggingTestCaseFIXME.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DefaultInterfaceContractMapper.java
Modified:
incubator/tuscany/java/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/StAXPerfTest.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataLoaderTestCase.java
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java
incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyService.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/monitor/ProxyMonitorFactory.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptModuleActivator.java
incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/DefaultWSDLInterfaceIntrospectorTestCase.java
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationTestCase.java
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
incubator/tuscany/java/sca/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
Modified: incubator/tuscany/java/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java Tue May 15 23:20:37 2007
@@ -52,8 +52,8 @@
import org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.impl.FolderContributionProcessor;
import org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
import org.apache.tuscany.sca.contribution.service.ContributionRepository;
import org.apache.tuscany.sca.contribution.service.ContributionService;
import org.apache.tuscany.sca.contribution.service.impl.ContributionRepositoryImpl;
@@ -64,7 +64,7 @@
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.DefaultInterfaceContractMapper;
+import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
@@ -84,7 +84,7 @@
// Create default factories
AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
PolicyFactory policyFactory = new DefaultPolicyFactory();
- InterfaceContractMapper mapper = new DefaultInterfaceContractMapper();
+ InterfaceContractMapper mapper = new InterfaceContractMapperImpl();
// Create an extension point registry
ExtensionPointRegistry extensionRegistry = new DefaultExtensionPointRegistry();
@@ -132,7 +132,7 @@
public void testContributeJAR() throws Exception {
URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
String contributionId = CONTRIBUTION_001_ID;
- ModelResolver resolver = new DefaultModelResolver(getClass().getClassLoader());
+ ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
contributionService.contribute(contributionId, contributionLocation, resolver, false);
assertNotNull(contributionService.getContribution(contributionId));
}
@@ -140,7 +140,7 @@
public void testStoreContributionPackageInRepository() throws Exception {
URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
String contributionId = CONTRIBUTION_001_ID;
- ModelResolver resolver = new DefaultModelResolver(getClass().getClassLoader());
+ ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
contributionService.contribute(contributionId, contributionLocation, resolver, true);
assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation()))
@@ -160,7 +160,7 @@
InputStream contributionStream = contributionLocation.openStream();
try {
- ModelResolver resolver = new DefaultModelResolver(getClass().getClassLoader());
+ ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
contributionService.contribute(contributionId, contributionLocation, contributionStream, resolver);
} finally {
IOHelper.closeQuietly(contributionStream);
@@ -180,11 +180,11 @@
public void testStoreDuplicatedContributionInRepository() throws Exception {
URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
String contributionId1 = CONTRIBUTION_001_ID;
- ModelResolver resolver = new DefaultModelResolver(getClass().getClassLoader());
+ ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
contributionService.contribute(contributionId1, contributionLocation, resolver, true);
assertNotNull(contributionService.getContribution(contributionId1));
String contributionId2 = CONTRIBUTION_002_ID;
- ModelResolver resolver2 = new DefaultModelResolver(getClass().getClassLoader());
+ ModelResolver resolver2 = new ModelResolverImpl(getClass().getClassLoader());
contributionService.contribute(contributionId2, contributionLocation, resolver2, true);
assertNotNull(contributionService.getContribution(contributionId2));
}
@@ -199,7 +199,7 @@
// FileHelper.forceMkdir(metadataDirectory);
//}
//FileHelper.copyFileToDirectory(calculatorMetadataFile, metadataDirectory);
- ModelResolver resolver = new DefaultModelResolver(getClass().getClassLoader());
+ ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
contributionService.contribute(contributionId, rootContributionFolder.toURL(), resolver, false);
assertNotNull(contributionService.getContribution(contributionId));
}
@@ -207,7 +207,7 @@
public void testAddDeploymentComposites() throws Exception {
URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
String contributionId = CONTRIBUTION_001_ID;
- ModelResolver resolver = new DefaultModelResolver(getClass().getClassLoader());
+ ModelResolver resolver = new ModelResolverImpl(getClass().getClassLoader());
Contribution contribution = contributionService.contribute(contributionId, contributionLocation, resolver, false);
assertNotNull(contributionService.getContribution(contributionId));
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java Tue May 15 23:20:37 2007
@@ -41,7 +41,7 @@
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.DefaultInterfaceContractMapper;
+import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
import org.w3c.dom.Document;
@@ -58,7 +58,7 @@
public void setUp() throws Exception {
AssemblyFactory factory = new DefaultAssemblyFactory();
PolicyFactory policyFactory = new DefaultPolicyFactory();
- InterfaceContractMapper mapper = new DefaultInterfaceContractMapper();
+ InterfaceContractMapper mapper = new InterfaceContractMapperImpl();
StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java Tue May 15 23:20:37 2007
@@ -35,9 +35,8 @@
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.DefaultInterfaceContractMapper;
+import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
@@ -49,12 +48,12 @@
public class ReadDocumentTestCase extends TestCase {
private ExtensibleURLArtifactProcessor documentProcessor;
- private DefaultModelResolver resolver;
+ private TestModelResolver resolver;
public void setUp() throws Exception {
AssemblyFactory factory = new DefaultAssemblyFactory();
PolicyFactory policyFactory = new DefaultPolicyFactory();
- InterfaceContractMapper mapper = new DefaultInterfaceContractMapper();
+ InterfaceContractMapper mapper = new InterfaceContractMapperImpl();
URLArtifactProcessorExtensionPoint documentProcessors = new DefaultURLArtifactProcessorExtensionPoint();
documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors);
@@ -72,7 +71,7 @@
documentProcessors.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxProcessor, inputFactory));
documentProcessors.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxProcessor, inputFactory));
- resolver = new DefaultModelResolver(getClass().getClassLoader());
+ resolver = new TestModelResolver(getClass().getClassLoader());
}
public void tearDown() throws Exception {
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java Tue May 15 23:20:37 2007
@@ -32,7 +32,7 @@
import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.DefaultInterfaceContractMapper;
+import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
@@ -53,7 +53,7 @@
public void setUp() throws Exception {
factory = new DefaultAssemblyFactory();
policyFactory = new DefaultPolicyFactory();
- mapper = new DefaultInterfaceContractMapper();
+ mapper = new InterfaceContractMapperImpl();
inputFactory = XMLInputFactory.newInstance();
staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java Tue May 15 23:20:37 2007
@@ -33,9 +33,8 @@
import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.DefaultInterfaceContractMapper;
+import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
@@ -49,7 +48,7 @@
private XMLInputFactory inputFactory;
private DefaultStAXArtifactProcessorExtensionPoint staxProcessors;
private ExtensibleStAXArtifactProcessor staxProcessor;
- private DefaultModelResolver resolver;
+ private TestModelResolver resolver;
private AssemblyFactory factory;
private PolicyFactory policyFactory;
private InterfaceContractMapper mapper;
@@ -57,11 +56,11 @@
public void setUp() throws Exception {
factory = new DefaultAssemblyFactory();
policyFactory = new DefaultPolicyFactory();
- mapper = new DefaultInterfaceContractMapper();
+ mapper = new InterfaceContractMapperImpl();
inputFactory = XMLInputFactory.newInstance();
staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
- resolver = new DefaultModelResolver(getClass().getClassLoader());
+ resolver = new TestModelResolver(getClass().getClassLoader());
}
public void tearDown() throws Exception {
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/StAXPerfTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/StAXPerfTest.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/StAXPerfTest.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/StAXPerfTest.java Tue May 15 23:20:37 2007
@@ -31,7 +31,7 @@
import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.DefaultInterfaceContractMapper;
+import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
@@ -76,7 +76,7 @@
inputFactory = XMLInputFactory.newInstance();
assemblyFactory = new DefaultAssemblyFactory();
policyFactory = new DefaultPolicyFactory();
- interfaceContractMapper = new DefaultInterfaceContractMapper();
+ interfaceContractMapper = new InterfaceContractMapperImpl();
staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
}
Added: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java?view=auto&rev=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java (added)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java Tue May 15 23:20:37 2007
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.assembly.xml;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+
+
+/**
+ * A default implementation of an artifact resolver, based on a map.
+ *
+ * @version $Rev$ $Date$
+ */
+public class TestModelResolver implements ModelResolver {
+ private static final long serialVersionUID = -7826976465762296634L;
+
+ private Map<Object, Object> map = new HashMap<Object, Object>();
+
+ public TestModelResolver(ClassLoader classLoader) {
+ }
+
+ public <T> T resolveModel(Class<T> modelClass, T unresolved) {
+ Object resolved = map.get(unresolved);
+ if (resolved != null) {
+
+ // Return the resolved object
+ return modelClass.cast(resolved);
+
+ } else {
+
+ // Return the unresolved object
+ return unresolved;
+ }
+ }
+
+ public void addModel(Object resolved) {
+ map.put(resolved, resolved);
+ }
+
+ public Object removeModel(Object resolved) {
+ return map.remove(resolved);
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java Tue May 15 23:20:37 2007
@@ -31,12 +31,11 @@
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.ConstrainingType;
import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.builder.impl.DefaultCompositeBuilder;
+import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.DefaultInterfaceContractMapper;
+import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
@@ -50,7 +49,7 @@
private XMLInputFactory inputFactory;
private DefaultStAXArtifactProcessorExtensionPoint staxProcessors;
private ExtensibleStAXArtifactProcessor staxProcessor;
- private DefaultModelResolver resolver;
+ private TestModelResolver resolver;
private AssemblyFactory factory;
private PolicyFactory policyFactory;
private InterfaceContractMapper mapper;
@@ -59,10 +58,10 @@
inputFactory = XMLInputFactory.newInstance();
staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
- resolver = new DefaultModelResolver(getClass().getClassLoader());
+ resolver = new TestModelResolver(getClass().getClassLoader());
factory = new DefaultAssemblyFactory();
policyFactory = new DefaultPolicyFactory();
- mapper = new DefaultInterfaceContractMapper();
+ mapper = new InterfaceContractMapperImpl();
}
public void tearDown() throws Exception {
@@ -91,7 +90,7 @@
assertNotNull(composite);
compositeReader.resolve(composite, resolver);
- DefaultCompositeBuilder compositeUtil = new DefaultCompositeBuilder(factory, mapper, null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(factory, mapper, null);
compositeUtil.build(composite);
assertEquals(composite.getConstrainingType(), constrainingType);
@@ -114,7 +113,7 @@
is.close();
compositeReader.resolve(composite, resolver);
- DefaultCompositeBuilder compositeUtil = new DefaultCompositeBuilder(factory, mapper, null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(factory, mapper, null);
compositeUtil.build(composite);
assertEquals(composite.getComponents().get(2).getImplementation(), nestedComposite);
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java Tue May 15 23:20:37 2007
@@ -32,12 +32,11 @@
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.ConstrainingType;
import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.builder.impl.DefaultCompositeBuilder;
+import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.DefaultInterfaceContractMapper;
+import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
@@ -49,24 +48,24 @@
public class WriteAllTestCase extends TestCase {
private DefaultStAXArtifactProcessorExtensionPoint staxProcessors;
private ExtensibleStAXArtifactProcessor staxProcessor;
- private DefaultModelResolver resolver;
+ private TestModelResolver resolver;
private AssemblyFactory factory;
private PolicyFactory policyFactory;
private InterfaceContractMapper mapper;
- private DefaultCompositeBuilder compositeUtil;
+ private CompositeBuilderImpl compositeUtil;
public void setUp() throws Exception {
factory = new DefaultAssemblyFactory();
policyFactory = new DefaultPolicyFactory();
- mapper = new DefaultInterfaceContractMapper();
- compositeUtil = new DefaultCompositeBuilder(factory, mapper, null);
+ mapper = new InterfaceContractMapperImpl();
+ compositeUtil = new CompositeBuilderImpl(factory, mapper, null);
staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
staxProcessors.addArtifactProcessor(new CompositeProcessor(factory, policyFactory, mapper, staxProcessor));
staxProcessors.addArtifactProcessor(new ComponentTypeProcessor(factory, policyFactory, staxProcessor));
staxProcessors.addArtifactProcessor(new ConstrainingTypeProcessor(factory, policyFactory, staxProcessor));
- resolver = new DefaultModelResolver(getClass().getClassLoader());
+ resolver = new TestModelResolver(getClass().getClassLoader());
}
public void tearDown() throws Exception {
Copied: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java (from r538415, incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DefaultCompositeBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java?view=diff&rev=538445&p1=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DefaultCompositeBuilder.java&r1=538415&p2=incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DefaultCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java Tue May 15 23:20:37 2007
@@ -52,7 +52,7 @@
*
* @version $Rev$ $Date$
*/
-public class DefaultCompositeBuilder implements CompositeBuilder {
+public class CompositeBuilderImpl implements CompositeBuilder {
private AssemblyFactory assemblyFactory;
private InterfaceContractMapper interfaceContractMapper;
@@ -64,7 +64,7 @@
* @param assemblyFactory
* @param interfaceContractMapper
*/
- public DefaultCompositeBuilder(AssemblyFactory assemblyFactory,
+ public CompositeBuilderImpl(AssemblyFactory assemblyFactory,
InterfaceContractMapper interfaceContractMapper,
CompositeBuilderMonitor monitor) {
this.assemblyFactory = assemblyFactory;
Modified: incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java Tue May 15 23:20:37 2007
@@ -29,17 +29,17 @@
import org.apache.tuscany.sca.assembly.CompositeReference;
import org.apache.tuscany.sca.assembly.CompositeService;
import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.interfacedef.impl.DefaultInterfaceContractMapper;
+import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
public class CompositeBuilderTestCase extends TestCase {
- private DefaultCompositeBuilder compositeUtil;
+ private CompositeBuilderImpl compositeUtil;
private AssemblyFactory factory;
protected void setUp() throws Exception {
factory = new DefaultAssemblyFactory();
- compositeUtil = new DefaultCompositeBuilder(factory, new DefaultInterfaceContractMapper(), null);
+ compositeUtil = new CompositeBuilderImpl(factory, new InterfaceContractMapperImpl(), null);
}
protected void tearDown() throws Exception {
Modified: incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java Tue May 15 23:20:37 2007
@@ -31,7 +31,7 @@
import org.apache.tuscany.sca.assembly.ComponentType;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.builder.impl.DefaultCompositeBuilder;
+import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
import org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;
import org.apache.tuscany.sca.assembly.xml.CompositeProcessor;
import org.apache.tuscany.sca.binding.ws.DefaultWebServiceBindingFactory;
@@ -39,7 +39,7 @@
import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.DefaultInterfaceContractMapper;
+import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.interfacedef.wsdl.DefaultWSDLFactory;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
import org.apache.tuscany.sca.interfacedef.wsdl.introspect.DefaultWSDLInterfaceIntrospector;
@@ -67,7 +67,7 @@
public void setUp() throws Exception {
factory = new DefaultAssemblyFactory();
policyFactory = new DefaultPolicyFactory();
- mapper = new DefaultInterfaceContractMapper();
+ mapper = new InterfaceContractMapperImpl();
inputFactory = XMLInputFactory.newInstance();
staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
@@ -108,7 +108,7 @@
Composite composite = compositeProcessor.read(reader);
assertNotNull(composite);
- DefaultCompositeBuilder compositeUtil = new DefaultCompositeBuilder(factory, mapper, null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(factory, mapper, null);
compositeUtil.build(composite);
//new PrintUtil(System.out).print(composite);
Modified: incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java Tue May 15 23:20:37 2007
@@ -39,7 +39,7 @@
import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.DefaultInterfaceContractMapper;
+import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.interfacedef.wsdl.DefaultWSDLFactory;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
import org.apache.tuscany.sca.interfacedef.wsdl.introspect.DefaultWSDLInterfaceIntrospector;
@@ -67,7 +67,7 @@
public void setUp() throws Exception {
factory = new DefaultAssemblyFactory();
policyFactory = new DefaultPolicyFactory();
- mapper = new DefaultInterfaceContractMapper();
+ mapper = new InterfaceContractMapperImpl();
inputFactory = XMLInputFactory.newInstance();
staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint();
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
Added: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java?view=auto&rev=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java (added)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java Tue May 15 23:20:37 2007
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.contribution.resolver.impl;
+
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.contribution.resolver.ClassReference;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+
+
+/**
+ * A default implementation of an artifact resolver, based on a map.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ModelResolverImpl implements ModelResolver {
+ private static final long serialVersionUID = -7826976465762296634L;
+
+ private Map<Object, Object> map = new HashMap<Object, Object>();
+
+ private WeakReference<ClassLoader> classLoader;
+
+ public ModelResolverImpl(ClassLoader classLoader) {
+ this.classLoader = new WeakReference<ClassLoader>(classLoader);
+ }
+
+ public <T> T resolveModel(Class<T> modelClass, T unresolved) {
+ Object resolved = map.get(unresolved);
+ if (resolved != null) {
+
+ // Return the resolved object
+ return modelClass.cast(resolved);
+
+ } else if (unresolved instanceof ClassReference) {
+
+ // Load a class on demand
+ ClassReference classReference = (ClassReference)unresolved;
+ Class clazz;
+ try {
+ clazz = Class.forName(classReference.getClassName(), true, classLoader.get());
+ } catch (ClassNotFoundException e) {
+
+ // Return the unresolved object
+ return unresolved;
+ }
+
+ // Store a new ClassReference wrappering the loaded class
+ resolved = new ClassReference(clazz);
+ map.put(resolved, resolved);
+
+ // Return the resolved ClassReference
+ return modelClass.cast(resolved);
+
+ } else {
+
+ // Return the unresolved object
+ return unresolved;
+ }
+ }
+
+ public void addModel(Object resolved) {
+ map.put(resolved, resolved);
+ }
+
+ public Object removeModel(Object resolved) {
+ return map.remove(resolved);
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java?view=auto&rev=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java (added)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java Tue May 15 23:20:37 2007
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.contribution.resolver;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
+
+/**
+ * Test DefaultArtifactResolver.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ArtifactResolverTestCase extends TestCase {
+
+ private ModelResolver resolver;
+
+ protected void setUp() throws Exception {
+ resolver = new ModelResolverImpl(getClass().getClassLoader());
+ }
+
+ protected void tearDown() throws Exception {
+ resolver = null;
+ }
+
+ public void testResolved() {
+ Model a = new Model("a");
+ resolver.addModel(a);
+ Model x = new Model("a");
+ x = resolver.resolveModel(Model.class, x);
+ assertTrue(x == a);
+ }
+
+ public void testUnresolved() {
+ Model x = new Model("a");
+ Model y = resolver.resolveModel(Model.class, x);
+ assertTrue(x == y);
+ }
+
+ public void testResolveClass() {
+ ClassReference ref = new ClassReference(getClass().getName());
+ ClassReference clazz = resolver.resolveModel(ClassReference.class, ref);
+ assertTrue(clazz.getJavaClass() == getClass());
+ }
+
+ public void testUnresolvedClass() {
+ ClassReference ref = new ClassReference("NonExistentClass");
+ ClassReference clazz = resolver.resolveModel(ClassReference.class, ref);
+ assertTrue(clazz.isUnresolved());
+ assertTrue(clazz.getJavaClass() == null);
+ }
+
+
+
+ class Model {
+ private String name;
+
+ Model(String name) {
+ this.name = name;
+ }
+
+ public int hashCode() {
+ return name.hashCode();
+ }
+
+ public boolean equals(Object obj) {
+ return name.equals(((Model)obj).name);
+ }
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ArtifactResolverTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataLoaderTestCase.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionMetadataLoaderTestCase.java Tue May 15 23:20:37 2007
@@ -30,7 +30,7 @@
import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.contribution.ContributionFactory;
import org.apache.tuscany.sca.contribution.impl.ContributionFactoryImpl;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.impl.ModelResolverImpl;
import org.apache.tuscany.sca.contribution.service.impl.ContributionMetadataLoaderImpl;
import org.apache.tuscany.sca.contribution.service.impl.InvalidValueException;
@@ -71,7 +71,7 @@
ContributionMetadataLoaderImpl loader =
new ContributionMetadataLoaderImpl(new DefaultAssemblyFactory(), factory);
Contribution contribution = factory.createContribution();
- contribution.setModelResolver(new DefaultModelResolver(getClass().getClassLoader()));
+ contribution.setModelResolver(new ModelResolverImpl(getClass().getClassLoader()));
loader.load(contribution, reader);
assertNotNull(contribution);
assertEquals(1, contribution.getImports().size());
@@ -85,7 +85,7 @@
ContributionMetadataLoaderImpl loader =
new ContributionMetadataLoaderImpl(new DefaultAssemblyFactory(), factory);
Contribution contribution = factory.createContribution();
- contribution.setModelResolver(new DefaultModelResolver(getClass().getClassLoader()));
+ contribution.setModelResolver(new ModelResolverImpl(getClass().getClassLoader()));
try {
loader.load(contribution, reader);
fail("InvalidException should have been thrown");
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java Tue May 15 23:20:37 2007
@@ -30,7 +30,7 @@
import org.apache.tuscany.sca.databinding.DefaultDataBindingExtensionPoint;
import org.apache.tuscany.sca.databinding.DefaultTransformerExtensionPoint;
import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.impl.DefaultMediator;
+import org.apache.tuscany.sca.databinding.impl.MediatorImpl;
import org.apache.tuscany.sca.databinding.impl.Group2GroupTransformer;
import org.apache.tuscany.sca.databinding.javabeans.DOMNode2JavaBeanTransformer;
import org.apache.tuscany.sca.databinding.javabeans.JavaBean2DOMNodeTransformer;
@@ -76,7 +76,7 @@
}
public void start(ExtensionPointRegistry registry) {
- DefaultMediator mediator = new DefaultMediator(dataBindings, transformers);
+ MediatorImpl mediator = new MediatorImpl(dataBindings, transformers);
Input2InputTransformer input2InputTransformer = new Input2InputTransformer();
input2InputTransformer.setMediator(mediator);
Copied: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java (from r538423, incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultWireProcessorExtensionPoint.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java?view=diff&rev=538445&p1=incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultWireProcessorExtensionPoint.java&r1=538423&p2=incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultWireProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java Tue May 15 23:20:37 2007
@@ -16,13 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.core.invocation;
+package org.apache.tuscany.sca.runtime;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.sca.runtime.RuntimeWireProcessor;
-import org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint;
/**
* The default implementation of a <code>WireProcessorExtensionPoint</code>
Added: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java?view=auto&rev=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java (added)
+++ incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java Tue May 15 23:20:37 2007
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.core.spring.context;
+
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.contribution.resolver.ClassReference;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+
+
+/**
+ * A default implementation of an artifact resolver, based on a map.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ModelResolverImpl implements ModelResolver {
+ private static final long serialVersionUID = -7826976465762296634L;
+
+ private Map<Object, Object> map = new HashMap<Object, Object>();
+
+ private WeakReference<ClassLoader> classLoader;
+
+ public ModelResolverImpl(ClassLoader classLoader) {
+ this.classLoader = new WeakReference<ClassLoader>(classLoader);
+ }
+
+ public <T> T resolveModel(Class<T> modelClass, T unresolved) {
+ Object resolved = map.get(unresolved);
+ if (resolved != null) {
+
+ // Return the resolved object
+ return modelClass.cast(resolved);
+
+ } else if (unresolved instanceof ClassReference) {
+
+ // Load a class on demand
+ ClassReference classReference = (ClassReference)unresolved;
+ Class clazz;
+ try {
+ clazz = Class.forName(classReference.getClassName(), true, classLoader.get());
+ } catch (ClassNotFoundException e) {
+
+ // Return the unresolved object
+ return unresolved;
+ }
+
+ // Store a new ClassReference wrappering the loaded class
+ resolved = new ClassReference(clazz);
+ map.put(resolved, resolved);
+
+ // Return the resolved ClassReference
+ return modelClass.cast(resolved);
+
+ } else {
+
+ // Return the unresolved object
+ return unresolved;
+ }
+ }
+
+ public void addModel(Object resolved) {
+ map.put(resolved, resolved);
+ }
+
+ public Object removeModel(Object resolved) {
+ return map.remove(resolved);
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java (original)
+++ incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java Tue May 15 23:20:37 2007
@@ -31,13 +31,12 @@
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderMonitor;
import org.apache.tuscany.sca.assembly.builder.Problem;
-import org.apache.tuscany.sca.assembly.builder.impl.DefaultCompositeBuilder;
+import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
import org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;
import org.apache.tuscany.sca.assembly.xml.CompositeProcessor;
import org.apache.tuscany.sca.assembly.xml.ConstrainingTypeProcessor;
import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionException;
import org.apache.tuscany.sca.core.spring.assembly.impl.BeanAssemblyFactory;
import org.apache.tuscany.sca.core.spring.implementation.java.impl.BeanJavaImplementationFactory;
@@ -64,7 +63,7 @@
import org.apache.tuscany.sca.implementation.java.introspect.impl.ServiceProcessor;
import org.apache.tuscany.sca.implementation.java.xml.JavaImplementationProcessor;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.DefaultInterfaceContractMapper;
+import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.sca.interfacedef.java.introspect.DefaultJavaInterfaceIntrospectorExtensionPoint;
@@ -94,7 +93,7 @@
// Create SCA assembly and SCA Java factories
AssemblyFactory assemblyFactory = new BeanAssemblyFactory(new DefaultAssemblyFactory(), beanFactory);
PolicyFactory policyFactory = new DefaultPolicyFactory();
- InterfaceContractMapper interfaceContractMapper = new DefaultInterfaceContractMapper();
+ InterfaceContractMapper interfaceContractMapper = new InterfaceContractMapperImpl();
JavaInterfaceFactory javaFactory = new DefaultJavaInterfaceFactory();
JavaInterfaceIntrospectorExtensionPoint interfaceVisitors = new DefaultJavaInterfaceIntrospectorExtensionPoint();
JavaImplementationFactory javaImplementationFactory = new BeanJavaImplementationFactory(beanFactory);
@@ -136,7 +135,7 @@
// Create a resolver
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- DefaultModelResolver resolver = new DefaultModelResolver(classLoader);
+ ModelResolverImpl resolver = new ModelResolverImpl(classLoader);
try {
@@ -179,7 +178,7 @@
};
// Configure and wire the composite
- DefaultCompositeBuilder compositeUtil = new DefaultCompositeBuilder(assemblyFactory, interfaceContractMapper, monitor);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, interfaceContractMapper, monitor);
compositeUtil.build(composite);
}
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyService.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyService.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyService.java Tue May 15 23:20:37 2007
@@ -22,7 +22,7 @@
import java.util.List;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.DefaultInterfaceContractMapper;
+import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.invocation.MessageFactory;
import org.apache.tuscany.sca.runtime.RuntimeWire;
import org.osoa.sca.CallableReference;
@@ -38,7 +38,7 @@
private MessageFactory messageFactory;
public JDKProxyService() {
- this(new MessageFactoryImpl(), new DefaultInterfaceContractMapper());
+ this(new MessageFactoryImpl(), new InterfaceContractMapperImpl());
}
public JDKProxyService(MessageFactory messageFactory, InterfaceContractMapper mapper) {
Copied: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java (from r538423, incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultCompositeActivator.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java?view=diff&rev=538445&p1=incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultCompositeActivator.java&r1=538423&p2=incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultCompositeActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java Tue May 15 23:20:37 2007
@@ -30,7 +30,7 @@
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderMonitor;
import org.apache.tuscany.sca.assembly.builder.Problem;
-import org.apache.tuscany.sca.assembly.builder.impl.DefaultCompositeBuilder;
+import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
import org.apache.tuscany.sca.core.invocation.InvocationChainImpl;
import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor;
import org.apache.tuscany.sca.interfacedef.IncompatibleInterfaceContractException;
@@ -58,7 +58,7 @@
/**
* @version $Rev$ $Date$
*/
-public class DefaultCompositeActivator implements CompositeActivator {
+public class CompositeActivatorImpl implements CompositeActivator {
private final AssemblyFactory assemblyFactory;
private final InterfaceContractMapper interfaceContractMapper;
@@ -74,7 +74,7 @@
* @param workScheduler
* @param wirePostProcessorRegistry
*/
- public DefaultCompositeActivator(AssemblyFactory assemblyFactory,
+ public CompositeActivatorImpl(AssemblyFactory assemblyFactory,
InterfaceContractMapper interfaceContractMapper,
ScopeRegistry scopeRegistry,
WorkScheduler workScheduler,
@@ -561,7 +561,7 @@
}
};
- DefaultCompositeBuilder builder = new DefaultCompositeBuilder(assemblyFactory, interfaceContractMapper, monitor);
+ CompositeBuilderImpl builder = new CompositeBuilderImpl(assemblyFactory, interfaceContractMapper, monitor);
builder.build(composite);
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java Tue May 15 23:20:37 2007
@@ -48,7 +48,7 @@
public class ThreadPoolWorkManager implements WorkManager {
// Map of work items currently handled by the work manager
- private Map<DefaultWorkItem, WorkListener> workItems = new ConcurrentHashMap<DefaultWorkItem, WorkListener>();
+ private Map<WorkItemImpl, WorkListener> workItems = new ConcurrentHashMap<WorkItemImpl, WorkListener>();
// Thread-pool
private ExecutorService executor;
@@ -81,7 +81,7 @@
*/
public WorkItem schedule(Work work, WorkListener workListener) throws WorkRejectedException {
- DefaultWorkItem workItem = new DefaultWorkItem(new UID().toString(), work);
+ WorkItemImpl workItem = new WorkItemImpl(new UID().toString(), work);
if (workListener != null) {
workItems.put(workItem, workListener);
}
@@ -91,7 +91,7 @@
} else {
workItem.setStatus(WorkEvent.WORK_REJECTED);
if (workListener != null) {
- workListener.workRejected(new DefaultWorkEvent(workItem));
+ workListener.workRejected(new WorkEventImpl(workItem));
}
throw new WorkRejectedException("Unable to schedule work");
}
@@ -123,11 +123,11 @@
* @param workItem Work item representing the work that was accepted.
* @param work Work that was accepted.
*/
- private void workAccepted(final DefaultWorkItem workItem, final Work work) {
+ private void workAccepted(final WorkItemImpl workItem, final Work work) {
WorkListener listener = workItems.get(workItem);
if (listener != null) {
workItem.setStatus(WorkEvent.WORK_ACCEPTED);
- WorkEvent event = new DefaultWorkEvent(workItem);
+ WorkEvent event = new WorkEventImpl(workItem);
listener.workAccepted(event);
}
}
@@ -135,11 +135,11 @@
/*
* Method to indicate a work start.
*/
- private void workStarted(final DefaultWorkItem workItem, final Work work) {
+ private void workStarted(final WorkItemImpl workItem, final Work work) {
WorkListener listener = workItems.get(workItem);
if (listener != null) {
workItem.setStatus(WorkEvent.WORK_STARTED);
- WorkEvent event = new DefaultWorkEvent(workItem);
+ WorkEvent event = new WorkEventImpl(workItem);
listener.workStarted(event);
}
}
@@ -147,20 +147,20 @@
/*
* Method to indicate a work completion.
*/
- private void workCompleted(final DefaultWorkItem workItem, final Work work) {
+ private void workCompleted(final WorkItemImpl workItem, final Work work) {
workCompleted(workItem, work, null);
}
/*
* Method to indicate a work completion.
*/
- private void workCompleted(final DefaultWorkItem workItem, final Work work, final WorkException exception) {
+ private void workCompleted(final WorkItemImpl workItem, final Work work, final WorkException exception) {
WorkListener listener = workItems.get(workItem);
if (listener != null) {
workItem.setStatus(WorkEvent.WORK_COMPLETED);
workItem.setResult(work);
workItem.setException(exception);
- WorkEvent event = new DefaultWorkEvent(workItem);
+ WorkEvent event = new WorkEventImpl(workItem);
listener.workCompleted(event);
workItems.remove(workItem);
}
@@ -169,7 +169,7 @@
/*
* Schedules the work using the threadpool.
*/
- private boolean scheduleWork(final Work work, final DefaultWorkItem workItem) {
+ private boolean scheduleWork(final Work work, final WorkItemImpl workItem) {
try {
executor.execute(new DecoratingWork(workItem, work));
return true;
@@ -184,7 +184,7 @@
private final class DecoratingWork implements Runnable {
// Work item for this work.
- private DefaultWorkItem workItem;
+ private WorkItemImpl workItem;
// The original work.
private Work decoratedWork;
@@ -192,7 +192,7 @@
/*
* Initializes the work item and underlying work.
*/
- private DecoratingWork(final DefaultWorkItem workItem, final Work decoratedWork) {
+ private DecoratingWork(final WorkItemImpl workItem, final Work decoratedWork) {
this.workItem = workItem;
this.decoratedWork = decoratedWork;
}
Copied: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java (from r538415, incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkEvent.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java?view=diff&rev=538445&p1=incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkEvent.java&r1=538415&p2=incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkEvent.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java Tue May 15 23:20:37 2007
@@ -26,7 +26,7 @@
/**
* Default immutable implementation of the <code>WorkEvent</code> class.
*/
-class DefaultWorkEvent implements WorkEvent {
+class WorkEventImpl implements WorkEvent {
// Work item for this event
private WorkItem workItem;
@@ -39,7 +39,7 @@
*
* @param workItem Work item for this event.
*/
- public DefaultWorkEvent(final DefaultWorkItem workItem) {
+ public WorkEventImpl(final WorkItemImpl workItem) {
this.workItem = workItem;
this.exception = workItem.getException();
}
Copied: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java (from r538415, incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkItem.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java?view=diff&rev=538445&p1=incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkItem.java&r1=538415&p2=incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/DefaultWorkItem.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java Tue May 15 23:20:37 2007
@@ -27,7 +27,7 @@
* interface.
*
*/
-class DefaultWorkItem implements WorkItem {
+class WorkItemImpl implements WorkItem {
// Id scoped for the VM
private String id;
@@ -49,7 +49,7 @@
*
* @param id of this work event.
*/
- protected DefaultWorkItem(final String id, final Work orginalWork) {
+ protected WorkItemImpl(final String id, final Work orginalWork) {
this.id = id;
this.originalWork = orginalWork;
}
@@ -143,7 +143,7 @@
* otherwise..
*/
public boolean equals(final Object obj) {
- return (obj != null) && (obj.getClass() == DefaultWorkItem.class) && ((DefaultWorkItem) obj).id.equals(id);
+ return (obj != null) && (obj.getClass() == WorkItemImpl.class) && ((WorkItemImpl) obj).id.equals(id);
}
/**
@@ -157,10 +157,10 @@
* @throws ClassCastException needs better documentation.
*/
public int compareTo(final Object o) {
- if (o.getClass() != DefaultWorkItem.class) {
+ if (o.getClass() != WorkItemImpl.class) {
throw new ClassCastException(o.getClass().getName());
} else {
- return ((DefaultWorkItem) o).getId().compareTo(getId());
+ return ((WorkItemImpl) o).getId().compareTo(getId());
}
}
}
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java Tue May 15 23:20:37 2007
@@ -27,7 +27,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
+import org.apache.tuscany.sca.assembly.xml.TestModelResolver;
import com.example.ipo.sdo.SdoFactory;
@@ -60,7 +60,7 @@
assertFalse(inited);
ImportSDO importSDO = loader.read(reader);
assertNotNull(importSDO);
- loader.resolve(importSDO, new DefaultModelResolver(getClass().getClassLoader()));
+ loader.resolve(importSDO, new TestModelResolver(getClass().getClassLoader()));
assertTrue(inited);
}
Added: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java?view=auto&rev=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java (added)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java Tue May 15 23:20:37 2007
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.databinding.sdo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+
+
+/**
+ * A default implementation of an artifact resolver, based on a map.
+ *
+ * @version $Rev$ $Date$
+ */
+public class TestModelResolver implements ModelResolver {
+ private static final long serialVersionUID = -7826976465762296634L;
+
+ private Map<Object, Object> map = new HashMap<Object, Object>();
+
+ public TestModelResolver(ClassLoader classLoader) {
+ }
+
+ public <T> T resolveModel(Class<T> modelClass, T unresolved) {
+ Object resolved = map.get(unresolved);
+ if (resolved != null) {
+
+ // Return the resolved object
+ return modelClass.cast(resolved);
+
+ } else {
+
+ // Return the unresolved object
+ return unresolved;
+ }
+ }
+
+ public void addModel(Object resolved) {
+ map.put(resolved, resolved);
+ }
+
+ public Object removeModel(Object resolved) {
+ return map.remove(resolved);
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java (from r538415, incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DefaultMediator.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java?view=diff&rev=538445&p1=incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DefaultMediator.java&r1=538415&p2=incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DefaultMediator.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java Tue May 15 23:20:37 2007
@@ -36,12 +36,12 @@
/**
* Default Mediator implementation
*/
-public class DefaultMediator implements Mediator {
+public class MediatorImpl implements Mediator {
private DataBindingExtensionPoint dataBindings;
private TransformerExtensionPoint transformers;
- public DefaultMediator(DataBindingExtensionPoint dataBindings,
+ public MediatorImpl(DataBindingExtensionPoint dataBindings,
TransformerExtensionPoint transformers) {
this.dataBindings = dataBindings;
this.transformers = transformers;
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java?view=diff&rev=538445&r1=538444&r2=538445
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java Tue May 15 23:20:37 2007
@@ -73,7 +73,7 @@
+ " </items>"
+ "</ipo:purchaseOrder>";
- private DefaultMediator mediator;
+ private MediatorImpl mediator;
protected void setUp() throws Exception {
super.setUp();
@@ -86,7 +86,7 @@
registry.addTransformer(new Node2String());
registry.addTransformer(new Node2Writer());
- mediator = new DefaultMediator(dataBindingRegistry, registry);
+ mediator = new MediatorImpl(dataBindingRegistry, registry);
}
private TransformationContext createTransformationContext(Class sourceType, Class targetType) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org