svn commit: r525718 - in /incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution: ./ extension/ loader/

[lr...@apache.org]

Author: lresende
Date: Wed Apr  4 23:14:57 2007
New Revision: 525718

URL: http://svn.apache.org/viewvc?view=rev&rev=525718
Log:
Updates to Contribution service model/api

Added:
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionPackageProcessor.java   (with props)
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionPackageProcessorRegistry.java
      - copied, changed from r525633, incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionProcessorRegistry.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionMetadataLoaderException.java
      - copied, changed from r525694, incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionLoaderException.java
Removed:
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionProcessor.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionProcessorRegistry.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionLoaderException.java
Modified:
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionService.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/extension/ContributionProcessorExtension.java
    incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionMetadataLoader.java

Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionPackageProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionPackageProcessor.java?view=auto&rev=525718
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionPackageProcessor.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionPackageProcessor.java Wed Apr  4 23:14:57 2007
@@ -0,0 +1,49 @@
+/*
+ * 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.services.spi.contribution;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+
+import org.apache.tuscany.services.contribution.model.Contribution;
+
+/**
+ * Interface for services that can process contributions.
+ * 
+ * @version $Rev: 522653 $ $Date: 2007-03-26 15:30:21 -0700 (Mon, 26 Mar 2007) $
+ */
+public interface ContributionPackageProcessor {
+    /**
+     * Process a contribution from the input stream. 
+     * The processor will then scan each artifact and invoke 
+     * the respective artifactProcessor to handle the artifact
+     * 
+     * @param contribution The contribution model that will be used to hold the
+     *            results from the processing
+     * @param source The URI for the contribution/artifact
+     * @param inputStream The input stream for the contribution. The stream will
+     *            not be closed but the read position after the call is
+     *            undefined
+     * @throws DeploymentException if there was a problem with the contribution
+     * @throws IOException if there was a problem reading the stream
+     */
+    void processContent(Contribution contribution, URI source, InputStream inputStream) throws ContributionException,
+        IOException;
+}

Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionPackageProcessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionPackageProcessorRegistry.java (from r525633, incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionProcessorRegistry.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionPackageProcessorRegistry.java?view=diff&rev=525718&p1=incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionProcessorRegistry.java&r1=525633&p2=incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionPackageProcessorRegistry.java&r2=525718
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionProcessorRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionPackageProcessorRegistry.java Wed Apr  4 23:14:57 2007
@@ -21,12 +21,12 @@
 /**
  * @version $Rev$ $Date$
  */
-public interface ContributionProcessorRegistry extends ContributionProcessor {
+public interface ContributionPackageProcessorRegistry extends ContributionPackageProcessor {
     /**
      * Register a ContributionProcessor using the content type as the key
      * @param processor
      */
-    void register(String contentType, ContributionProcessor processor);
+    void register(String contentType, ContributionPackageProcessor processor);
     
     /**
      * Unregister a ContributionProcessor by content type

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionService.java?view=diff&rev=525718&r1=525717&r2=525718
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionService.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/ContributionService.java Wed Apr  4 23:14:57 2007
@@ -89,16 +89,16 @@
      */
     void remove(URI contribution) throws ContributionException;
 
-  /**
-  * Resolve an artifact by QName within the contribution
-  * 
-  * @param <T> The java type of the artifact such as javax.wsdl.Definition
-  * @param contribution The URI of the contribution
-  * @param definitionType The java type of the artifact
-  * @param namespace The namespace of the artifact
-  * @param name The name of the artifact
-  * @return The resolved artifact
-  */
- <M> M resolve(Class modelClass, Class<M> elementClass, Object modelKey, Object elementKey, Map<String, Object> attributes);
+    /**
+    * Resolve an artifact by QName within the contribution
+    * 
+    * @param <T> The java type of the artifact such as javax.wsdl.Definition
+    * @param contribution The URI of the contribution
+    * @param definitionType The java type of the artifact
+    * @param namespace The namespace of the artifact
+    * @param name The name of the artifact
+    * @return The resolved artifact
+    */
+    <M> M resolve(Class modelClass, Class<M> elementClass, Object modelKey, Object elementKey, Map<String, Object> attributes);
  
 }

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/extension/ContributionProcessorExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/extension/ContributionProcessorExtension.java?view=diff&rev=525718&r1=525717&r2=525718
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/extension/ContributionProcessorExtension.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/extension/ContributionProcessorExtension.java Wed Apr  4 23:14:57 2007
@@ -19,25 +19,25 @@
 
 package org.apache.tuscany.services.spi.contribution.extension;
 
-import org.apache.tuscany.services.spi.contribution.ContributionProcessor;
-import org.apache.tuscany.services.spi.contribution.ContributionProcessorRegistry;
+import org.apache.tuscany.services.spi.contribution.ContributionPackageProcessor;
+import org.apache.tuscany.services.spi.contribution.ContributionPackageProcessorRegistry;
 
 /**
  * The base class for ContributionProcessor implementations
  *
  * @version $Rev$ $Date$
  */
-public abstract class ContributionProcessorExtension implements ContributionProcessor {
+public abstract class ContributionProcessorExtension implements ContributionPackageProcessor {
     /**
      * The ContributionProcessorRegistry that this processor should register with; usually set by injection. This
      * registry may also be used to process other sub-artifacts.
      */
-    protected ContributionProcessorRegistry registry;
+    protected ContributionPackageProcessorRegistry registry;
 
     /**
      * @param registry the registry to set
      */
-    public void setContributionProcessorRegistry(ContributionProcessorRegistry registry) {
+    public void setContributionProcessorRegistry(ContributionPackageProcessorRegistry registry) {
         this.registry = registry;
     }
 

Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionMetadataLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionMetadataLoader.java?view=diff&rev=525718&r1=525717&r2=525718
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionMetadataLoader.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionMetadataLoader.java Wed Apr  4 23:14:57 2007
@@ -30,7 +30,7 @@
      * @param reader    the XML stream reader positioned on the applicable START_ELEMENT
      * @return
      * @throws XMLStreamException
-     * @throws ContributionLoaderException
+     * @throws ContributionMetadataReadException
      */
-    public Contribution load(XMLStreamReader reader) throws XMLStreamException, ContributionLoaderException;
+    public Contribution load(XMLStreamReader reader) throws XMLStreamException, ContributionMetadataLoaderException;
 }

Copied: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionMetadataLoaderException.java (from r525694, incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionLoaderException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionMetadataLoaderException.java?view=diff&rev=525718&p1=incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionLoaderException.java&r1=525694&p2=incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionMetadataLoaderException.java&r2=525718
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionLoaderException.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/services/spi/contribution/loader/ContributionMetadataLoaderException.java Wed Apr  4 23:14:57 2007
@@ -21,34 +21,34 @@
 
 import org.apache.tuscany.services.spi.contribution.ContributionException;
 
-public class ContributionLoaderException extends ContributionException {
+public class ContributionMetadataLoaderException extends ContributionException {
 
     /**
      * 
      */
     private static final long serialVersionUID = 2442537028550702609L;
 
-    public ContributionLoaderException() {
+    public ContributionMetadataLoaderException() {
         super();
     }
 
-    public ContributionLoaderException(String message) {
+    public ContributionMetadataLoaderException(String message) {
         super(message);
     }
 
-    public ContributionLoaderException(String message, String identifier) {
+    public ContributionMetadataLoaderException(String message, String identifier) {
         super(message, identifier);
     }
 
-    public ContributionLoaderException(String message, Throwable cause) {
+    public ContributionMetadataLoaderException(String message, Throwable cause) {
         super(message, cause);
     }
 
-    public ContributionLoaderException(String message, String identifier, Throwable cause) {
+    public ContributionMetadataLoaderException(String message, String identifier, Throwable cause) {
         super(message, identifier, cause);
     }
 
-    public ContributionLoaderException(Throwable cause) {
+    public ContributionMetadataLoaderException(Throwable cause) {
         super(cause);
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org