Refactored contribution exceptions, moved them to the contribution.processor package which is exported out of the contribution module. Removed unused implementation classes. Moved test cases from contribution-impl to contribution. Also renamed a few test cases that had compile errors as easymock is not on the classpath.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@704156 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 6 insertions, 181 deletions

diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java b/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
index b21ad6642c..71fd03d549 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
+++ b/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
@@ -29,11 +29,11 @@ import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.tuscany.sca.contribution.java.JavaExport;
 import org.apache.tuscany.sca.contribution.java.JavaImportExportFactory;
+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java b/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
deleted file mode 100644
index 4a21ad3291..0000000000
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*

- * 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.java.impl;

-

-import java.util.ArrayList;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.apache.tuscany.sca.contribution.Artifact;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.ContributionFactory;

-import org.apache.tuscany.sca.contribution.Export;

-import org.apache.tuscany.sca.contribution.Import;

-import org.apache.tuscany.sca.contribution.java.JavaExport;

-import org.apache.tuscany.sca.contribution.java.JavaImport;

-import org.apache.tuscany.sca.contribution.resolver.DefaultImportAllModelResolver;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.contribution.service.ContributionListener;

-import org.apache.tuscany.sca.contribution.service.ContributionRepository;

-import org.apache.tuscany.sca.core.FactoryExtensionPoint;

-

-/**

- * Java Import/Export contribution listener

- * The listener would process all import/export from a given contribution 

- * and initialize the model resolvers properly

- * 

- * @version $Rev$ $Date$

- */

-public class JavaImportExportListener implements ContributionListener {

-    

-    private ContributionFactory contributionFactory;

-    

-    /**

-     * Constructs a new JavaImportExportListener

-     */

-    public JavaImportExportListener(FactoryExtensionPoint modelFactories) {

-        contributionFactory = modelFactories.getFactory(ContributionFactory.class);

-    }

-    

-    /**

-     * Initialize the import/export model resolvers

-     * Export model resolvers are same as Contribution model resolver

-     * Import model resolvers are matched to a specific contribution if a location URI is specified, 

-     *    otherwise it try to resolve against all the other contributions

-     * Also set the exporting contributions used by contribution ClassLoaders to 

-     * match import/export for class loading.

-     */

-    public void contributionAdded(ContributionRepository repository, Contribution contribution) {

-        

-        // If the contribution does not contain sca-contribution.xml metadata

-        // (for example it's an existing JAR developed before SCA existed)

-        // export all its Java packages

-        ModelResolver modelResolver = contribution.getModelResolver();

-        

-        // Look for META-INF/sca-contribution.xml

-        Artifact artifact = contributionFactory.createArtifact();

-        artifact.setURI(Contribution.SCA_CONTRIBUTION_META);

-        artifact = modelResolver.resolveModel(Artifact.class, artifact);

-        if (artifact.getLocation() == null) {

-

-            // Look for META-INF/sca-contribution-generated.xml

-            artifact.setURI(Contribution.SCA_CONTRIBUTION_GENERATED_META);

-            artifact = modelResolver.resolveModel(Artifact.class, artifact);

-            if (artifact.getLocation() == null) {

-                

-                // No contribution metadata file was found, default to export all the

-                // Java packages found in the contribution

-                Set<String> packages = new HashSet<String>();

-                for (Artifact a: contribution.getArtifacts()) {

-                    String uri = a.getURI();

-                    if (uri.endsWith(".class")) {

-                        uri = uri.substring(0, uri.length() - 6);

-                        int d = uri.lastIndexOf('/');

-                        if (d != -1) {

-                            packages.add(uri.substring(0, d).replace('/', '.'));

-                        }

-                    }

-                }

-                

-                // Add Java export model objects for all the packages we found

-                for (String pkg: packages) {

-                    JavaExport export = new JavaExportImpl();

-                    export.setPackage(pkg);

-                    contribution.getExports().add(export);

-                }

-            }

-        }

-        

-        // Initialize the contribution exports

-        for (Export export: contribution.getExports()) {

-            export.setModelResolver(contribution.getModelResolver());

-        }

-        

-        // Initialize the contribution imports

-        for (Import import_: contribution.getImports()) {

-            boolean initialized = false;

-            

-            if(import_ instanceof JavaImport) {

-                JavaImport javaImport = (JavaImport) import_;

-                

-                //Find a matching contribution

-                if(javaImport.getLocation() != null) {

-                    Contribution targetContribution = repository.getContribution(javaImport.getLocation());

-                    if (targetContribution != null) {

-                    

-                        // Find a matching contribution export

-                        for (Export export: targetContribution.getExports()) {

-                            if (export instanceof JavaExport) {

-                                JavaExport javaExport = (JavaExport)export;

-                                if (javaImport.getPackage().equals(javaExport.getPackage())) {

-                                    List<Contribution> exportingContributions = new ArrayList<Contribution>();

-                                    exportingContributions.add(targetContribution);

-                                    javaImport.setModelResolver(new JavaImportModelResolver(exportingContributions, javaExport.getModelResolver()));

-                                    initialized = true;

-                                    break;

-                                }

-                            }

-                        }

-                    }                    

-                }

-

-                //if no location was specified, try to resolve with any contribution

-                if (!initialized) {

-                    //Use a resolver that will consider all contributions

-                    import_.setModelResolver(new JavaImportModelResolver(repository.getContributions(), new DefaultImportAllModelResolver(import_, repository.getContributions())));

-                }

-            }

-        }

-    }

-

-    public void contributionRemoved(ContributionRepository repository, Contribution contribution) {

-

-    }

-

-    public void contributionUpdated(ContributionRepository repository, Contribution oldContribution, Contribution contribution) {

-

-    }

-

-}

diff --git a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java b/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
index 7a692c1687..d191153e34 100644
--- a/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
+++ b/branches/sca-equinox/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
@@ -29,11 +29,11 @@ import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.tuscany.sca.contribution.java.JavaImport;
 import org.apache.tuscany.sca.contribution.java.JavaImportExportFactory;
+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
diff --git a/branches/sca-equinox/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/branches/sca-equinox/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
deleted file mode 100644
index 7debb3d3c6..0000000000
--- a/branches/sca-equinox/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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. 

-

-org.apache.tuscany.sca.contribution.java.impl.JavaImportExportListener