You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/07/22 17:33:23 UTC
svn commit: r558497 - in /incubator/tuscany/java/sca: itest/
itest/contribution-import-export/
itest/contribution-import-export/contrib-wsdl/src/main/resources/META-INF/
itest/contribution-import-export/test-import-composite/src/test/java/helloworld/
i...
Author: lresende
Date: Sun Jul 22 08:33:22 2007
New Revision: 558497
URL: http://svn.apache.org/viewvc?view=rev&rev=558497
Log:
Updates to ModelReseolver extensibility
- Fixing import/export WSDL
- Adding import/export Composite
Added:
incubator/tuscany/java/sca/itest/contribution-import-export/contrib-wsdl/src/main/resources/META-INF/
incubator/tuscany/java/sca/itest/contribution-import-export/contrib-wsdl/src/main/resources/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ContributionExportModelResolverImpl.java
- copied, changed from r558455, incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionExportModelResolverImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ContributionImportAnyModelResolverImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ContributionImportModelResolverImpl.java
- copied, changed from r558455, incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImportModelResolverImpl.java
Removed:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionExportModelResolverImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImportModelResolverImpl.java
Modified:
incubator/tuscany/java/sca/itest/contribution-import-export/pom.xml
incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/src/test/java/helloworld/HelloWorldServerTestCase.java
incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/src/test/java/helloworld/HelloWorldServerTestCase.java
incubator/tuscany/java/sca/itest/pom.xml
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/host/impl/NodeRuntimeBuilder.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/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
Added: incubator/tuscany/java/sca/itest/contribution-import-export/contrib-wsdl/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/contrib-wsdl/src/main/resources/META-INF/sca-contribution.xml?view=auto&rev=558497
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/contrib-wsdl/src/main/resources/META-INF/sca-contribution.xml (added)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/contrib-wsdl/src/main/resources/META-INF/sca-contribution.xml Sun Jul 22 08:33:22 2007
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ targetNamespace="http://helloworld"
+ xmlns:helloworld="http://helloworld">
+ <export namespace="http://helloworld"/>
+</contribution>
\ No newline at end of file
Modified: incubator/tuscany/java/sca/itest/contribution-import-export/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/pom.xml?view=diff&rev=558497&r1=558496&r2=558497
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/pom.xml Sun Jul 22 08:33:22 2007
@@ -31,9 +31,13 @@
<modules>
<module>contrib-wsdl</module>
- <module>contrib-composite</module>
<module>test-import-wsdl</module>
+ <!--
+ <module>contrib-composite</module>
<module>test-import-composite</module>
+ <module>contrib-java</module>
+ <module>test-import-java</module>
+ -->
</modules>
<dependencies>
Modified: incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/src/test/java/helloworld/HelloWorldServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/src/test/java/helloworld/HelloWorldServerTestCase.java?view=diff&rev=558497&r1=558496&r2=558497
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/src/test/java/helloworld/HelloWorldServerTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/src/test/java/helloworld/HelloWorldServerTestCase.java Sun Jul 22 08:33:22 2007
@@ -75,6 +75,14 @@
new Socket("127.0.0.1", 8085);
}
+// public void testServiceCall() throws IOException {
+// HelloWorldService helloWorldService = domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");
+// assertNotNull(helloWorldService);
+//
+// assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
+// }
+
+
public void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/src/test/java/helloworld/HelloWorldServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/src/test/java/helloworld/HelloWorldServerTestCase.java?view=diff&rev=558497&r1=558496&r2=558497
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/src/test/java/helloworld/HelloWorldServerTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/src/test/java/helloworld/HelloWorldServerTestCase.java Sun Jul 22 08:33:22 2007
@@ -73,6 +73,13 @@
new Socket("127.0.0.1", 8085);
}
+ public void testServiceCall() throws IOException {
+ HelloWorldService helloWorldService = domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");
+ assertNotNull(helloWorldService);
+
+ assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
+ }
+
public void tearDown() throws Exception {
domain.close();
}
Modified: incubator/tuscany/java/sca/itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/pom.xml?view=diff&rev=558497&r1=558496&r2=558497
==============================================================================
--- incubator/tuscany/java/sca/itest/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/pom.xml Sun Jul 22 08:33:22 2007
@@ -43,9 +43,7 @@
<module>callback-set-callback</module>
<module>callback-set-conversation</module>
<module>contribution</module>
- <!--
<module>contribution-import-export</module>
- -->
<module>conversations</module>
<module>databindings</module>
<module>exceptions</module>
Added: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java?view=auto&rev=558497
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java (added)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java Sun Jul 22 08:33:22 2007
@@ -0,0 +1,70 @@
+/*
+ * 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 org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.ContributionImport;
+import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
+
+/**
+ * An Model Resolver for Composite artifact types.
+ *
+ * @version $Rev: 557916 $ $Date: 2007-07-20 01:04:40 -0700 (Fri, 20 Jul 2007) $
+ */
+public class CompositeModelResolver extends DefaultModelResolver {
+
+ public CompositeModelResolver(ClassLoader cl, Contribution contribution) {
+ super(cl,contribution);
+ }
+
+ private Composite resolveImportedModel(Composite unresolved) {
+ Composite resolved = unresolved;
+ String namespace = unresolved.getName().getNamespaceURI();
+ if (namespace != null && namespace.length() > 0) {
+ for (ContributionImport contributionImport : this.contribution.getImports()) {
+ if (contributionImport.getNamespace().equals(namespace)) {
+
+ // Delegate the resolution to the import resolver
+ resolved = contributionImport.getModelResolver().resolveModel(Composite.class, unresolved);
+
+ // If resolved... then we are done
+ if(unresolved.isUnresolved() == false) {
+ break;
+ }
+ }
+ }
+ }
+ return resolved;
+ }
+
+ @Override
+ public <T> T resolveModel(Class<T> modelClass, T unresolved) {
+ Composite resolved = (Composite) super.resolveModel(modelClass, unresolved);
+
+ if (resolved.isUnresolved()) {
+ resolved = resolveImportedModel(resolved);
+ }
+
+ return (T)resolved;
+ }
+
+
+}
Copied: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ContributionExportModelResolverImpl.java (from r558455, incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionExportModelResolverImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ContributionExportModelResolverImpl.java?view=diff&rev=558497&p1=incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionExportModelResolverImpl.java&r1=558455&p2=incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ContributionExportModelResolverImpl.java&r2=558497
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionExportModelResolverImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ContributionExportModelResolverImpl.java Sun Jul 22 08:33:22 2007
@@ -17,11 +17,17 @@
* under the License.
*/
-package org.apache.tuscany.sca.contribution.impl;
+package org.apache.tuscany.sca.contribution.resolver.impl;
import org.apache.tuscany.sca.contribution.ContributionExport;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+
+/**
+ * A model resolver implementation, that considers Contribution Exports.
+ *
+ * @version $Rev$ $Date$
+ */
public class ContributionExportModelResolverImpl implements ModelResolver {
private ContributionExport contributionExport;
@@ -41,7 +47,6 @@
}
public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-
// Delegate to the model resolver of the contribution
return targetModelResolver.resolveModel(modelClass, unresolved);
}
Added: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ContributionImportAnyModelResolverImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ContributionImportAnyModelResolverImpl.java?view=auto&rev=558497
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ContributionImportAnyModelResolverImpl.java (added)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ContributionImportAnyModelResolverImpl.java Sun Jul 22 08:33:22 2007
@@ -0,0 +1,73 @@
+/*
+ * 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.util.Map;
+
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.ContributionExport;
+import org.apache.tuscany.sca.contribution.ContributionImport;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+
+/**
+ * A model resolver implementation, that consider Contribution Imports in any contribution
+ *
+ * @version $Rev: 548560 $ $Date: 2007-06-18 19:25:19 -0700 (Mon, 18 Jun 2007) $
+ */
+public class ContributionImportAnyModelResolverImpl implements ModelResolver {
+
+ private ContributionImport contributionImport;
+ private Map<String, Contribution> contributionRegistry;
+
+ public ContributionImportAnyModelResolverImpl(ContributionImport contributionImport, Map<String, Contribution> contributionRegistry) {
+ this.contributionImport = contributionImport;
+ this.contributionRegistry = contributionRegistry;
+ }
+
+ public void addModel(Object resolved) {
+ throw new IllegalStateException();
+ }
+
+ public Object removeModel(Object resolved) {
+ throw new IllegalStateException();
+ }
+
+ public <T> T resolveModel(Class<T> modelClass, T unresolved) {
+ // This needs to delegate to the matching ContributionExportModelResolver
+ // from the contribution matching the import's location URI, or a ModelResolver
+ // that goes over all exports with a matching namespace if there is no URI
+
+ Object resolved = null;
+ for (Contribution contribution : contributionRegistry.values()) {
+ for (ContributionExport contributionExport : contribution.getExports()) {
+ if (contributionImport.getNamespace().equals(contributionExport.getNamespace())) {
+ resolved = contributionExport.getModelResolver().resolveModel(modelClass, unresolved);
+ }
+ }
+ }
+
+ if (resolved != null) {
+ return modelClass.cast(resolved);
+ } else {
+ return unresolved;
+ }
+ }
+
+}
Copied: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ContributionImportModelResolverImpl.java (from r558455, incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImportModelResolverImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ContributionImportModelResolverImpl.java?view=diff&rev=558497&p1=incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImportModelResolverImpl.java&r1=558455&p2=incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ContributionImportModelResolverImpl.java&r2=558497
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImportModelResolverImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ContributionImportModelResolverImpl.java Sun Jul 22 08:33:22 2007
@@ -17,11 +17,16 @@
* under the License.
*/
-package org.apache.tuscany.sca.contribution.impl;
+package org.apache.tuscany.sca.contribution.resolver.impl;
import org.apache.tuscany.sca.contribution.ContributionImport;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+/**
+ * A model resolver implementation, that considers Contribution Imports.
+ *
+ * @version $Rev$ $Date$
+ */
public class ContributionImportModelResolverImpl implements ModelResolver {
private ContributionImport contributionImport;
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java?view=diff&rev=558497&r1=558496&r2=558497
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java Sun Jul 22 08:33:22 2007
@@ -40,14 +40,15 @@
import org.apache.tuscany.sca.contribution.ContributionFactory;
import org.apache.tuscany.sca.contribution.ContributionImport;
import org.apache.tuscany.sca.contribution.DeployedArtifact;
-import org.apache.tuscany.sca.contribution.impl.ContributionExportModelResolverImpl;
-import org.apache.tuscany.sca.contribution.impl.ContributionImportModelResolverImpl;
import org.apache.tuscany.sca.contribution.processor.ContributionPostProcessor;
import org.apache.tuscany.sca.contribution.processor.PackageProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
+import org.apache.tuscany.sca.contribution.resolver.impl.ContributionExportModelResolverImpl;
+import org.apache.tuscany.sca.contribution.resolver.impl.ContributionImportAnyModelResolverImpl;
+import org.apache.tuscany.sca.contribution.resolver.impl.ContributionImportModelResolverImpl;
import org.apache.tuscany.sca.contribution.service.ContributionException;
import org.apache.tuscany.sca.contribution.service.ContributionMetadataLoaderException;
import org.apache.tuscany.sca.contribution.service.ContributionRepository;
@@ -292,17 +293,24 @@
// Initialize the contribution imports
for (ContributionImport contributionImport: contribution.getImports()) {
- // Find a matching contribution
- Contribution targetContribution = contributionRegistry.get(contribution.getURI());
- if (targetContribution == null)
- continue;
+ if (contributionImport.getLocation() != null && contribution.getLocation().length() > 0) {
+ // Find a matching contribution
+ Contribution targetContribution = contributionRegistry.get(contributionImport.getLocation());
+ if (targetContribution != null) {
+ // Find a matching contribution export
+ for (ContributionExport contributionExport: targetContribution.getExports()) {
+ if (contributionImport.getNamespace().equals(contributionExport.getNamespace())) {
+ contributionImport.setModelResolver(new ContributionImportModelResolverImpl(contributionImport, contributionExport.getModelResolver()));
+ break;
+ }
+ }
+ }
+ }
- // Find a matching contribution export
- for (ContributionExport contributionExport: targetContribution.getExports()) {
- if (contributionImport.getNamespace().equals(contributionExport.getNamespace())) {
- contributionImport.setModelResolver(new ContributionImportModelResolverImpl(contributionImport, contributionExport.getModelResolver()));
- break;
- }
+ if (contributionImport.getModelResolver() == null) {
+ // Find a matching in any contribution export
+ contributionImport.setModelResolver(new ContributionImportAnyModelResolverImpl(contributionImport, contributionRegistry));
+
}
}
@@ -408,7 +416,7 @@
if (artifact.getModel() != null) {
this.artifactProcessor.resolve(artifact.getModel(), contribution.getModelResolver());
- processResolveImportsPhase(contribution, artifact);
+ //processResolveImportsPhase(contribution, artifact);
}
}
@@ -417,9 +425,11 @@
for (Composite deployableComposite : contribution.getDeployables()) {
Composite resolvedDeployable = contribution.getModelResolver().resolveModel(Composite.class, deployableComposite);
+ /*
if (resolvedDeployable.isUnresolved()) {
resolvedDeployable = processResolveImportsPhase(contribution, resolvedDeployable);
}
+ */
resolvedDeployables.add(resolvedDeployable);
}
@@ -427,6 +437,7 @@
contribution.getDeployables().addAll(resolvedDeployables);
}
+ /*
@SuppressWarnings("unchecked")
private Object processResolveImportsPhase(Contribution contribution, DeployedArtifact artifact) throws ContributionException {
for(ContributionImport contributionImport : contribution.getImports()) {
@@ -475,5 +486,6 @@
}
return resolvedDeployable;
- }
+ }
+ */
}
Modified: incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/host/impl/NodeRuntimeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/host/impl/NodeRuntimeBuilder.java?view=diff&rev=558497&r1=558496&r2=558497
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/host/impl/NodeRuntimeBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/host/impl/NodeRuntimeBuilder.java Sun Jul 22 08:33:22 2007
@@ -25,8 +25,10 @@
import javax.xml.stream.XMLOutputFactory;
import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.xml.ComponentTypeDocumentProcessor;
import org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;
+import org.apache.tuscany.sca.assembly.xml.CompositeModelResolver;
import org.apache.tuscany.sca.assembly.xml.CompositeProcessor;
import org.apache.tuscany.sca.assembly.xml.ConstrainingTypeDocumentProcessor;
import org.apache.tuscany.sca.assembly.xml.ConstrainingTypeProcessor;
@@ -122,6 +124,8 @@
//Create Contribution Model Resolver extension point
ModelResolverExtensionPoint modelResolverExtensionPoint = new DefaultModelResolverExtensionPoint();
registry.addExtensionPoint(modelResolverExtensionPoint);
+
+ modelResolverExtensionPoint.addResolver(Composite.class, CompositeModelResolver.class);
//Create contribution postProcessor extension point
DefaultContributionPostProcessorExtensionPoint contributionPostProcessors = new DefaultContributionPostProcessorExtensionPoint();
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java?view=diff&rev=558497&r1=558496&r2=558497
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java Sun Jul 22 08:33:22 2007
@@ -37,10 +37,12 @@
import javax.xml.stream.XMLOutputFactory;
import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.xml.ComponentTypeDocumentProcessor;
import org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;
import org.apache.tuscany.sca.assembly.xml.CompositeDocumentProcessor;
+import org.apache.tuscany.sca.assembly.xml.CompositeModelResolver;
import org.apache.tuscany.sca.assembly.xml.CompositeProcessor;
import org.apache.tuscany.sca.assembly.xml.ConstrainingTypeDocumentProcessor;
import org.apache.tuscany.sca.assembly.xml.ConstrainingTypeProcessor;
@@ -61,7 +63,6 @@
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
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.DefaultModelResolverExtensionPoint;
import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
import org.apache.tuscany.sca.contribution.service.ContributionRepository;
@@ -83,7 +84,6 @@
import org.apache.tuscany.sca.core.scope.RequestScopeContainerFactory;
import org.apache.tuscany.sca.core.scope.ScopeRegistryImpl;
import org.apache.tuscany.sca.core.scope.StatelessScopeContainerFactory;
-import org.apache.tuscany.sca.core.store.MemoryStore;
import org.apache.tuscany.sca.core.work.Jsr237WorkScheduler;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.invocation.MessageFactory;
@@ -205,6 +205,8 @@
//Create Contribution Model Resolver extension point
ModelResolverExtensionPoint modelResolverExtensionPoint = new DefaultModelResolverExtensionPoint();
registry.addExtensionPoint(modelResolverExtensionPoint);
+
+ modelResolverExtensionPoint.addResolver(Composite.class, CompositeModelResolver.class);
//Create contribution postProcessor extension point
DefaultContributionPostProcessorExtensionPoint contributionPostProcessors = new DefaultContributionPostProcessorExtensionPoint();
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java?view=diff&rev=558497&r1=558496&r2=558497
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java Sun Jul 22 08:33:22 2007
@@ -36,13 +36,14 @@
}
private WSDLDefinition resolveImportedModel(WSDLDefinition unresolved) {
+ WSDLDefinition resolved = unresolved;
String namespace = unresolved.getNamespace();
if (namespace != null && namespace.length() > 0) {
for (ContributionImport contributionImport : this.contribution.getImports()) {
if (contributionImport.getNamespace().equals(namespace)) {
// Delegate the resolution to the import resolver
- contributionImport.getModelResolver().resolveModel(WSDLDefinition.class, unresolved);
+ resolved = contributionImport.getModelResolver().resolveModel(WSDLDefinition.class, unresolved);
// If resolved... then we are done
if(unresolved.isUnresolved() == false) {
@@ -51,7 +52,7 @@
}
}
}
- return unresolved;
+ return resolved;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org