Author: adrianocrestani Date: Mon Apr 7 12:38:10 2008 New Revision: 645658
URL: http://svn.apache.org/viewvc?rev=645658&view=rev Log: -updating android test files Modified: incubator/tuscany/sandbox/mobile-android/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java incubator/tuscany/sandbox/mobile-android/core-android/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java incubator/tuscany/sandbox/mobile-android/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java incubator/tuscany/sandbox/mobile-android/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java Modified: incubator/tuscany/sandbox/mobile-android/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java?rev=645658&r1=645657&r2=645658&view=diff ============================================================================== --- incubator/tuscany/sandbox/mobile-android/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java (original) +++ incubator/tuscany/sandbox/mobile-android/core-android/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java Mon Apr 7 12:38:10 2008 @@ -18,8 +18,8 @@ */ package org.apache.tuscany.sca.core.work; -import javax.naming.InitialContext; -import javax.naming.NamingException; +/*import javax.naming.InitialContext; +import javax.naming.NamingException;*/ import org.apache.tuscany.sca.work.NotificationListener; import org.apache.tuscany.sca.work.WorkScheduler; Modified: incubator/tuscany/sandbox/mobile-android/core-android/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/core-android/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java?rev=645658&r1=645657&r2=645658&view=diff ============================================================================== --- incubator/tuscany/sandbox/mobile-android/core-android/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java (original) +++ incubator/tuscany/sandbox/mobile-android/core-android/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java Mon Apr 7 12:38:10 2008 @@ -18,7 +18,7 @@ */ package org.apache.tuscany.sca.core.work; -import java.rmi.server.UID; +//import java.rmi.server.UID; import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -89,7 +89,7 @@ */ public WorkItem schedule(Work work, WorkListener workListener) throws IllegalArgumentException { - WorkItemImpl workItem = new WorkItemImpl(new UID().toString(), work); + WorkItemImpl workItem = new WorkItemImpl(null/*new UID().toString()*/, work); if (workListener != null) { workItems.put(workItem, workListener); } Modified: incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java?rev=645658&r1=645657&r2=645658&view=diff ============================================================================== --- incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java (original) +++ incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java Mon Apr 7 12:38:10 2008 @@ -34,8 +34,7 @@ /** * Constructs a new SCA domain */ - public SCADomainBean() { - } + public SCADomainBean() {} @Override public String getURI() { Modified: incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java?rev=645658&r1=645657&r2=645658&view=diff ============================================================================== --- incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java (original) +++ incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java Mon Apr 7 12:38:10 2008 @@ -67,10 +67,10 @@ */ public EmbeddedSCADomain(ClassLoader runtimeClassLoader, String domainURI) { - this.uri = domainURI; + this.uri = domainURI; // Create a runtime - runtime = new ReallySmallRuntime(runtimeClassLoader); + runtime = new ReallySmallRuntime(null/*runtimeClassLoader*/); } public void start() throws ActivationException { Modified: incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java?rev=645658&r1=645657&r2=645658&view=diff ============================================================================== --- incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java (original) +++ incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java Mon Apr 7 12:38:10 2008 @@ -78,7 +78,7 @@ protected static final String REPOSITORY_FOLDER = "sca-contributions"; public HotUpdatableSCADomain(String domainURI, File contributionRepository, int hotupdateInterval) { - this.domainURI = domainURI; + this.domainURI = domainURI; this.contributionRepository = contributionRepository; this.hotUpdateInterval = hotupdateInterval; this.originalCCL = Thread.currentThread().getContextClassLoader(); Modified: incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java?rev=645658&r1=645657&r2=645658&view=diff ============================================================================== --- incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java (original) +++ incubator/tuscany/sandbox/mobile-android/host-android/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java Mon Apr 7 12:38:10 2008 @@ -40,7 +40,10 @@ import org.apache.tuscany.sca.context.ContextFactoryExtensionPoint; import org.apache.tuscany.sca.context.RequestContextFactory; import org.apache.tuscany.sca.contribution.ContributionFactory; +import org.apache.tuscany.sca.contribution.DefaultModelFactoryExtensionPoint; import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.DefaultPackageProcessorExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.DefaultURLArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.contribution.processor.DefaultValidatingXMLInputFactory; import org.apache.tuscany.sca.contribution.processor.DefaultValidationSchemaExtensionPoint; import org.apache.tuscany.sca.contribution.processor.ExtensiblePackageProcessor; @@ -51,11 +54,13 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint; +import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolverExtensionPoint; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; import org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint; import org.apache.tuscany.sca.contribution.service.ContributionRepository; import org.apache.tuscany.sca.contribution.service.ContributionService; +import org.apache.tuscany.sca.contribution.service.DefaultContributionListenerExtensionPoint; import org.apache.tuscany.sca.contribution.service.ExtensibleContributionListener; import org.apache.tuscany.sca.contribution.service.TypeDescriber; import org.apache.tuscany.sca.contribution.service.impl.ContributionRepositoryImpl; @@ -88,6 +93,9 @@ import org.apache.tuscany.sca.runtime.RuntimeWireProcessor; import org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint; import org.apache.tuscany.sca.work.WorkScheduler; +import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint; + +import android.content.Context; public class ReallySmallRuntimeBuilder { @@ -178,22 +186,27 @@ */ ValidationSchemaExtensionPoint schemas = new DefaultValidationSchemaExtensionPoint(); + registry.addExtensionPoint(schemas); - schemas.addSchema(ReallySmallRuntimeBuilder.class.getClassLoader().getResource("tuscany-sca.xsd").toString()); + //schemas.addSchema(ReallySmallRuntimeBuilder.class.getClassLoader().getResource("tuscany-sca.xsd").toString()); // Create a new XML input factory - XMLInputFactory inputFactory = XMLInputFactory.newInstance(); + XMLInputFactory inputFactory = null;//XMLInputFactory.newInstance(); // Create a validating XML input factory - XMLInputFactory validatingInputFactory = new DefaultValidatingXMLInputFactory(inputFactory, schemas); + XMLInputFactory validatingInputFactory = null;//new DefaultValidatingXMLInputFactory(inputFactory, schemas); // Create STAX artifact processor extension point - StAXArtifactProcessorExtensionPoint staxProcessors = - registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); + //StAXArtifactProcessorExtensionPoint staxProcessors = + // ; + + registry.addExtensionPoint(new DefaultModelFactoryExtensionPoint()); + StAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(registry.getExtensionPoint(ModelFactoryExtensionPoint.class)); + registry.addExtensionPoint(staxProcessors); // Create and register STAX processors for SCA assembly XML ExtensibleStAXArtifactProcessor staxProcessor = - new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, XMLOutputFactory.newInstance()); + new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null/*XMLOutputFactory.newInstance()*/); staxProcessors.addArtifactProcessor(new CompositeProcessor(contributionFactory, assemblyFactory, policyFactory, staxProcessor)); staxProcessors.addArtifactProcessor(new ComponentTypeProcessor(assemblyFactory, policyFactory, staxProcessor)); staxProcessors @@ -204,9 +217,10 @@ staxProcessor)); // Create URL artifact processor extension point - URLArtifactProcessorExtensionPoint documentProcessors = - registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - + URLArtifactProcessorExtensionPoint documentProcessors = new DefaultURLArtifactProcessorExtensionPoint(registry.getExtensionPoint(ModelFactoryExtensionPoint.class)); + registry.addExtensionPoint(documentProcessors); + //registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); + // Create and register document processors for SCA assembly XML documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, validatingInputFactory, scaDefinitionsSink)); documentProcessors.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxProcessor, validatingInputFactory)); @@ -221,16 +235,18 @@ ModelResolver domainModelResolver = definitionsDocumentProcessor.getSCADefinitionsResolver(); // Create Model Resolver extension point - ModelResolverExtensionPoint modelResolvers = registry.getExtensionPoint(ModelResolverExtensionPoint.class); + ModelResolverExtensionPoint modelResolvers = new DefaultModelResolverExtensionPoint(); // Create contribution package processor extension point TypeDescriber describer = new PackageTypeDescriberImpl(); PackageProcessor packageProcessor = - new ExtensiblePackageProcessor(registry.getExtensionPoint(PackageProcessorExtensionPoint.class), describer); + new ExtensiblePackageProcessor(new DefaultPackageProcessorExtensionPoint(), describer); // Get the model factory extension point ModelFactoryExtensionPoint modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class); + registry.addExtensionPoint(new DefaultContributionListenerExtensionPoint(modelFactories)); + // Create contribution listener ExtensibleContributionListener contributionListener = new ExtensibleContributionListener(registry.getExtensionPoint(ContributionListenerExtensionPoint.class)); Modified: incubator/tuscany/sandbox/mobile-android/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java?rev=645658&r1=645657&r2=645658&view=diff ============================================================================== --- incubator/tuscany/sandbox/mobile-android/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java (original) +++ incubator/tuscany/sandbox/mobile-android/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java Mon Apr 7 12:38:10 2008 @@ -37,7 +37,7 @@ @Override protected void setUp() throws Exception { - domain = SCADomain.newInstance("test.composite"); + domain = SCADomain.newInstance(null, "test.composite"); } public void testInvoke() throws Exception { Modified: incubator/tuscany/sandbox/mobile-android/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java?rev=645658&r1=645657&r2=645658&view=diff ============================================================================== --- incubator/tuscany/sandbox/mobile-android/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java (original) +++ incubator/tuscany/sandbox/mobile-android/host-android/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java Mon Apr 7 12:38:10 2008 @@ -35,7 +35,7 @@ @Override protected void setUp() throws Exception { - domain = new DefaultSCADomain(getClass().getClassLoader(), getClass().getClassLoader(), + domain = new DefaultSCADomain(getClass().getClassLoader(), null, "http://localhost";, ".", "test.composite"); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
