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/03 09:24:50 UTC
svn commit: r534738 [2/2] - in /incubator/tuscany/java/sca:
modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/
modules/assembly-xml/src/test/java/org/apache/tuscany/assembly/xml/
modules/assembly/src/main/java/org/apache/tuscany/assemb...
Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessor.java?view=auto&rev=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessor.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessor.java Thu May 3 00:24:45 2007
@@ -0,0 +1,50 @@
+/*
+ * 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.contribution.processor;
+
+import java.net.URI;
+import java.net.URL;
+
+import org.apache.tuscany.contribution.service.ContributionReadException;
+
+/**
+ * An artifact processor that can read models from an InputStream.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface URLArtifactProcessor<M> extends ArtifactProcessor<M> {
+
+ /**
+ * Reads a model from an input source. Examples of input
+ * sources are: a URI, a DOM node, an XML reader.
+ * @param contributionURL
+ * @param artifactURI
+ * @param artifactURL
+ * @return a model representation of the input.
+ */
+ M read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException;
+
+ /**
+ * Returns the type of artifact handled by this artifact processor.
+ * @return the type of artifact handled by this artifact processor
+ */
+ String getArtifactType();
+
+}
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtensionPoint.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/contribution/processor/URLArtifactProcessorExtensionPoint.java Thu May 3 00:24:45 2007
@@ -26,6 +26,6 @@
* @version $Rev$ $Date$
*/
public interface URLArtifactProcessorExtensionPoint extends
- ArtifactProcessorExtensionPoint<URLArtifactProcessorExtension> {
+ ArtifactProcessorExtensionPoint<URLArtifactProcessor> {
}
Modified: incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/runtime/ComponentContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/runtime/ComponentContext.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/runtime/ComponentContext.java (original)
+++ incubator/tuscany/java/sca/modules/core-spring/src/main/java/org/apache/tuscany/core/spring/runtime/ComponentContext.java Thu May 3 00:24:45 2007
@@ -171,24 +171,9 @@
};
- // Collect and fuse includes
- compositeUtil.fuseIncludes(composite, problems);
+ // Configure and wire the composite
+ compositeUtil.configureAndWire(composite, problems);
- // Expand nested composites
- compositeUtil.expandComposites(composite, problems);
-
- // Configure all components
- compositeUtil.configureComponents(composite, problems);
-
- // Wire the composite
- compositeUtil.wireComposite(composite, problems);
-
- // Activate composite services
- compositeUtil.activateCompositeServices(composite, problems);
-
- // Wire composite references
- compositeUtil.wireCompositeReferences(composite, problems);
-
// if (!problems.isEmpty()) {
// throw new VariantRuntimeException(new RuntimeException("Problems in the composite..."));
// }
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultCompositeActivator.java Thu May 3 00:24:45 2007
@@ -411,24 +411,8 @@
return super.add(o);
}
};
-
- // Collect and fuse includes
- compositeUtil.fuseIncludes(composite, problems);
-
- // Expand nested composites
- compositeUtil.expandComposites(composite, problems);
-
- // Configure all components
- compositeUtil.configureComponents(composite, problems);
-
- // Wire the composite
- compositeUtil.wireComposite(composite, problems);
-
- // Activate composite services
- compositeUtil.activateCompositeServices(composite, problems);
-
- // Wire composite references
- compositeUtil.wireCompositeReferences(composite, problems);
+
+ compositeUtil.configureAndWire(composite, problems);
// if (!problems.isEmpty()) {
// throw new VariantRuntimeException(new RuntimeException("Problems in
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOProcessor.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOProcessor.java Thu May 3 00:24:45 2007
@@ -33,7 +33,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtension;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.contribution.resolver.ArtifactResolver;
import org.apache.tuscany.contribution.service.ContributionReadException;
import org.apache.tuscany.contribution.service.ContributionResolveException;
@@ -49,7 +49,7 @@
*
* @version $Rev$ $Date$
*/
-public class ImportSDOProcessor implements StAXArtifactProcessorExtension<ImportSDO> {
+public class ImportSDOProcessor implements StAXArtifactProcessor<ImportSDO> {
private HelperContextRegistry helperContextRegistry;
public ImportSDOProcessor(HelperContextRegistry helperContextRegistry) {
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/SimpleRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/SimpleRuntimeImpl.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/SimpleRuntimeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/host/embedded/impl/SimpleRuntimeImpl.java Thu May 3 00:24:45 2007
@@ -241,20 +241,9 @@
};
- // Collect and fuse includes
- compositeUtil.fuseIncludes(composite, problems);
+ // Configure and wire the composite
+ compositeUtil.oldConfigureAndWire(composite, problems);
- // Configure all components
- compositeUtil.configureComponents(composite, problems);
-
- //FIXME this should only be done on top level deployable composites
-
- // Expand nested composites
- //compositeUtil.expandComposites(composite, problems);
-
- // Wire the composite
- compositeUtil.wireComposite(composite, problems);
-
// Uncommenting the following three lines can be useful to detect
// and troubleshoot SCA assembly XML composite configuration
// problems.
Modified: incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementationProcessor.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementationProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/host-embedded/src/test/java/crud/CRUDImplementationProcessor.java Thu May 3 00:24:45 2007
@@ -26,7 +26,7 @@
import javax.xml.stream.XMLStreamWriter;
import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtension;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.contribution.resolver.ArtifactResolver;
import org.apache.tuscany.contribution.service.ContributionReadException;
import org.apache.tuscany.contribution.service.ContributionResolveException;
@@ -44,7 +44,7 @@
*
* @version $Rev$ $Date$
*/
-public class CRUDImplementationProcessor implements StAXArtifactProcessorExtension<CRUDImplementation> {
+public class CRUDImplementationProcessor implements StAXArtifactProcessor<CRUDImplementation> {
private static final QName IMPLEMENTATION_CRUD = new QName("http://crud", "implementation.crud");
private AssemblyFactory assemblyFactory;
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationProcessor.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/implementation/java/xml/JavaImplementationProcessor.java Thu May 3 00:24:45 2007
@@ -29,7 +29,7 @@
import org.apache.tuscany.assembly.AssemblyFactory;
import org.apache.tuscany.assembly.xml.BaseArtifactProcessor;
import org.apache.tuscany.assembly.xml.Constants;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtension;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.contribution.resolver.ArtifactResolver;
import org.apache.tuscany.contribution.resolver.ClassReference;
import org.apache.tuscany.contribution.service.ContributionReadException;
@@ -42,7 +42,7 @@
import org.apache.tuscany.policy.PolicyFactory;
public class JavaImplementationProcessor extends BaseArtifactProcessor implements
- StAXArtifactProcessorExtension<JavaImplementation>, JavaImplementationConstants {
+ StAXArtifactProcessor<JavaImplementation>, JavaImplementationConstants {
private JavaImplementationFactory javaFactory;
private JavaClassIntrospector introspector;
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java Thu May 3 00:24:45 2007
@@ -91,9 +91,7 @@
assertNotNull(composite);
CompositeUtil compositeUtil = new CompositeUtil(factory, mapper);
- compositeUtil.fuseIncludes(composite, new ArrayList<Base>());
- compositeUtil.configureComponents(composite, new ArrayList<Base>());
- compositeUtil.wireComposite(composite, new ArrayList<Base>());
+ compositeUtil.configureAndWire(composite, new ArrayList<Base>());
//new PrintUtil(System.out).print(composite);
}
@@ -109,9 +107,7 @@
staxProcessors.resolve(composite, resolver);
CompositeUtil compositeUtil = new CompositeUtil(factory, mapper);
- compositeUtil.fuseIncludes(composite, new ArrayList<Base>());
- compositeUtil.configureComponents(composite, new ArrayList<Base>());
- compositeUtil.wireComposite(composite, new ArrayList<Base>());
+ compositeUtil.configureAndWire(composite, new ArrayList<Base>());
//new PrintUtil(System.out).print(composite);
}
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptArtifactProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptArtifactProcessor.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptArtifactProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/implementation/script/ScriptArtifactProcessor.java Thu May 3 00:24:45 2007
@@ -38,13 +38,13 @@
import org.apache.tuscany.assembly.Reference;
import org.apache.tuscany.assembly.Service;
import org.apache.tuscany.assembly.xml.Constants;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtension;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.contribution.resolver.ArtifactResolver;
import org.apache.tuscany.contribution.service.ContributionReadException;
import org.apache.tuscany.contribution.service.ContributionResolveException;
import org.apache.tuscany.contribution.service.ContributionWriteException;
-public class ScriptArtifactProcessor implements StAXArtifactProcessorExtension<ScriptImplementation> {
+public class ScriptArtifactProcessor implements StAXArtifactProcessor<ScriptImplementation> {
private static final String SCRIPT = "script";
private static final String LANGUAGE = "language";
Modified: incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/xml/JavaInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/xml/JavaInterfaceProcessor.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/xml/JavaInterfaceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java-xml/src/main/java/org/apache/tuscany/interfacedef/java/xml/JavaInterfaceProcessor.java Thu May 3 00:24:45 2007
@@ -27,7 +27,7 @@
import javax.xml.stream.XMLStreamWriter;
import org.apache.tuscany.assembly.xml.Constants;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtension;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.contribution.resolver.ArtifactResolver;
import org.apache.tuscany.contribution.resolver.ClassReference;
import org.apache.tuscany.contribution.service.ContributionReadException;
@@ -39,7 +39,7 @@
import org.apache.tuscany.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.interfacedef.java.introspect.JavaInterfaceIntrospector;
-public class JavaInterfaceProcessor implements StAXArtifactProcessorExtension<JavaInterfaceContract>, JavaConstants {
+public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfaceContract>, JavaConstants {
private JavaFactory javaFactory;
private JavaInterfaceIntrospector introspector;
Modified: incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java Thu May 3 00:24:45 2007
@@ -110,9 +110,7 @@
assertNotNull(composite);
CompositeUtil compositeUtil = new CompositeUtil(factory, mapper);
- compositeUtil.fuseIncludes(composite, new ArrayList<Base>());
- compositeUtil.configureComponents(composite, new ArrayList<Base>());
- compositeUtil.wireComposite(composite, new ArrayList<Base>());
+ compositeUtil.configureAndWire(composite, new ArrayList<Base>());
//new PrintUtil(System.out).print(composite);
}
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLDocumentProcessor.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLDocumentProcessor.java Thu May 3 00:24:45 2007
@@ -32,7 +32,7 @@
import javax.wsdl.xml.WSDLLocator;
import javax.wsdl.xml.WSDLReader;
-import org.apache.tuscany.contribution.processor.URLArtifactProcessorExtension;
+import org.apache.tuscany.contribution.processor.URLArtifactProcessor;
import org.apache.tuscany.contribution.resolver.ArtifactResolver;
import org.apache.tuscany.contribution.service.ContributionReadException;
import org.apache.tuscany.contribution.service.ContributionResolveException;
@@ -49,7 +49,7 @@
*
* @version $Rev$ $Date$
*/
-public class WSDLDocumentProcessor implements URLArtifactProcessorExtension<WSDLDefinition> {
+public class WSDLDocumentProcessor implements URLArtifactProcessor<WSDLDefinition> {
private javax.wsdl.factory.WSDLFactory wsdlFactory;
private ExtensionRegistry wsdlExtensionRegistry;
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java Thu May 3 00:24:45 2007
@@ -28,7 +28,7 @@
import javax.xml.stream.XMLStreamWriter;
import org.apache.tuscany.assembly.xml.Constants;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtension;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.contribution.resolver.ArtifactResolver;
import org.apache.tuscany.contribution.service.ContributionReadException;
import org.apache.tuscany.contribution.service.ContributionResolveException;
@@ -40,7 +40,7 @@
import org.apache.tuscany.interfacedef.wsdl.WSDLInterfaceContract;
import org.apache.tuscany.interfacedef.wsdl.introspect.WSDLInterfaceIntrospector;
-public class WSDLInterfaceProcessor implements StAXArtifactProcessorExtension<WSDLInterfaceContract>, WSDLConstants {
+public class WSDLInterfaceProcessor implements StAXArtifactProcessor<WSDLInterfaceContract>, WSDLConstants {
private WSDLFactory wsdlFactory;
private WSDLInterfaceIntrospector wsdlIntrospector;
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/XSDDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/XSDDocumentProcessor.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/XSDDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/interfacedef/wsdl/xml/XSDDocumentProcessor.java Thu May 3 00:24:45 2007
@@ -25,7 +25,7 @@
import java.net.URI;
import java.net.URL;
-import org.apache.tuscany.contribution.processor.URLArtifactProcessorExtension;
+import org.apache.tuscany.contribution.processor.URLArtifactProcessor;
import org.apache.tuscany.contribution.resolver.ArtifactResolver;
import org.apache.tuscany.contribution.service.ContributionReadException;
import org.apache.tuscany.contribution.service.ContributionResolveException;
@@ -41,7 +41,7 @@
*
* @version $Rev$ $Date$
*/
-public class XSDDocumentProcessor implements URLArtifactProcessorExtension<XSDefinition> {
+public class XSDDocumentProcessor implements URLArtifactProcessor<XSDefinition> {
private WSDLFactory factory;
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java Thu May 3 00:24:45 2007
@@ -104,9 +104,7 @@
assertNotNull(composite);
CompositeUtil compositeUtil = new CompositeUtil(factory, mapper);
- compositeUtil.fuseIncludes(composite, new ArrayList<Base>());
- compositeUtil.configureComponents(composite, new ArrayList<Base>());
- compositeUtil.wireComposite(composite, new ArrayList<Base>());
+ compositeUtil.configureAndWire(composite, new ArrayList<Base>());
//new PrintUtil(System.out).print(composite);
}
Modified: incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingProcessor.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingProcessor.java (original)
+++ incubator/tuscany/java/sca/samples/binding-echo/src/main/java/echo/EchoBindingProcessor.java Thu May 3 00:24:45 2007
@@ -23,7 +23,7 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtension;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.contribution.resolver.ArtifactResolver;
import org.apache.tuscany.contribution.service.ContributionReadException;
import org.apache.tuscany.contribution.service.ContributionResolveException;
@@ -34,7 +34,7 @@
*
* @version $Rev$ $Date$
*/
-public class EchoBindingProcessor implements StAXArtifactProcessorExtension<EchoBinding> {
+public class EchoBindingProcessor implements StAXArtifactProcessor<EchoBinding> {
private final EchoBindingFactory factory;
public EchoBindingProcessor() {
Modified: incubator/tuscany/java/sca/samples/databinding-echo/src/main/java/echo/EchoBindingProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/databinding-echo/src/main/java/echo/EchoBindingProcessor.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/samples/databinding-echo/src/main/java/echo/EchoBindingProcessor.java (original)
+++ incubator/tuscany/java/sca/samples/databinding-echo/src/main/java/echo/EchoBindingProcessor.java Thu May 3 00:24:45 2007
@@ -23,14 +23,14 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtension;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.contribution.resolver.ArtifactResolver;
import org.apache.tuscany.contribution.service.ContributionReadException;
import org.apache.tuscany.contribution.service.ContributionResolveException;
import org.apache.tuscany.contribution.service.ContributionWireException;
import org.apache.tuscany.contribution.service.ContributionWriteException;
-public class EchoBindingProcessor implements StAXArtifactProcessorExtension<EchoBinding> {
+public class EchoBindingProcessor implements StAXArtifactProcessor<EchoBinding> {
private final EchoBindingFactory factory;
public EchoBindingProcessor() {
Modified: incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/CRUDImplementationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/CRUDImplementationProcessor.java?view=diff&rev=534738&r1=534737&r2=534738
==============================================================================
--- incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/CRUDImplementationProcessor.java (original)
+++ incubator/tuscany/java/sca/samples/implementation-crud/src/main/java/crud/CRUDImplementationProcessor.java Thu May 3 00:24:45 2007
@@ -26,7 +26,7 @@
import javax.xml.stream.XMLStreamWriter;
import org.apache.tuscany.assembly.AssemblyFactory;
-import org.apache.tuscany.contribution.processor.StAXArtifactProcessorExtension;
+import org.apache.tuscany.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.contribution.resolver.ArtifactResolver;
import org.apache.tuscany.contribution.service.ContributionReadException;
import org.apache.tuscany.contribution.service.ContributionResolveException;
@@ -44,7 +44,7 @@
*
* @version $Rev$ $Date$
*/
-public class CRUDImplementationProcessor implements StAXArtifactProcessorExtension<CRUDImplementation> {
+public class CRUDImplementationProcessor implements StAXArtifactProcessor<CRUDImplementation> {
private static final QName IMPLEMENTATION_CRUD = new QName("http://crud", "implementation.crud");
private AssemblyFactory assemblyFactory;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org