Official Tuscany 2.0.1 Release

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

1 files changed, 0 insertions, 173 deletions

diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/DirectoryContributionScanner.java b/sca-java-2.x/tags/2.0.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/DirectoryContributionScanner.java
deleted file mode 100644
index 4a064c8fa9..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/DirectoryContributionScanner.java
+++ /dev/null
@@ -1,173 +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.scanner.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.security.AccessControlException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-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.PackageType;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.scanner.ContributionScanner;
-
-/**
- * Folder contribution processor.
- *
- * @version $Rev$ $Date$
- */
-public class DirectoryContributionScanner implements ContributionScanner {
-	private static final Logger logger = Logger.getLogger(DirectoryContributionScanner.class.getName());
-
-    private ContributionFactory contributionFactory;
-
-    public DirectoryContributionScanner(ContributionFactory contributionFactory) {
-        this.contributionFactory = contributionFactory;
-    }
-
-    public String getContributionType() {
-        return PackageType.FOLDER;
-    }
-
-    public List<Artifact> scan(Contribution contribution) throws ContributionReadException {
-        File directory = directory(contribution);
-        List<Artifact> artifacts = new ArrayList<Artifact>();
-        List<String> artifactURIs = scanContributionArtifacts(contribution);
-        for(String uri : artifactURIs) {
-            try {
-                File file = new File(directory, uri);
-
-                Artifact artifact = contributionFactory.createArtifact();
-                artifact.setURI(uri);
-                artifact.setLocation(file.toURI().toURL().toString());
-
-                artifacts.add(artifact);
-            } catch (MalformedURLException e) {
-                throw new ContributionReadException(e);
-            }
-        }
-
-        contribution.getTypes().add(getContributionType());
-        return artifacts;
-    }
-
-
-    /**
-     * Scan the contribution to retrieve all artifact uris
-     *
-     * @param contribution
-     * @return
-     * @throws ContributionReadException
-     */
-    private List<String> scanContributionArtifacts(Contribution contribution) throws ContributionReadException {
-        File directory = directory(contribution);
-        List<String> artifacts = new ArrayList<String>();
-        // [rfeng] There are cases that the folder contains symbolic links that point to the same physical directory
-        Set<File> visited = new HashSet<File>();
-        try {
-            traverse(artifacts, directory, directory, visited);
-        } catch (IOException e) {
-            throw new ContributionReadException(e);
-        }
-
-        return artifacts;
-    }
-
-    /**
-     * Recursively traverse a root directory
-     *
-     * @param fileList
-     * @param file
-     * @param root
-     * @param visited The visited directories
-     * @throws IOException
-     */
-    private static void traverse(List<String> fileList, File file, File root, Set<File> visited) throws IOException {
-
-    	//TUSCANY-3667 - Google add some private directories when you deploy your application
-    	//to GAE and trying to execute file IO operations on it's contents fails with AccessControlException
-    	try {
-            if (file.isFile()) {
-                fileList.add(root.toURI().relativize(file.toURI()).toString());
-            } else if (file.isDirectory()) {
-                File dir = file.getCanonicalFile();
-                if (!visited.contains(dir)) {
-                    // [rfeng] Add the canonical file into the visited set to avoid duplicate navigation of directories
-                    // following the symbolic links
-                    visited.add(dir);
-                    String uri = root.toURI().relativize(file.toURI()).toString();
-                    if (uri.endsWith("/")) {
-                        uri = uri.substring(0, uri.length() - 1);
-                    }
-                    fileList.add(uri);
-
-                    File[] files = file.listFiles();
-                    for (File f : files) {
-                        if (!f.getName().startsWith(".")) {
-                            traverse(fileList, f, root, visited);
-                        }
-                    }
-                }
-            }
-    	} catch (AccessControlException e) {
-    		//TUSCANY-3667 - Log the AccessControlException error and continue without processing the file/directory
-    		logger.log(Level.WARNING, "Error traversing file:" + file.getPath());
-    	}
-
-    }
-
-    /**
-     * Get the contribution location as a file
-     *
-     * @param contribution
-     * @return
-     * @throws ContributionReadException
-     */
-    private File directory(Contribution contribution) throws ContributionReadException {
-        File file;
-        URI uri = null;
-        try {
-            uri = new URI(contribution.getLocation());
-            file = new File(uri);
-        } catch (URISyntaxException e) {
-            throw new ContributionReadException(e);
-        } catch(IllegalArgumentException e) {
-            // Hack for file:./a.txt or file:../a/c.wsdl
-            return new File(uri.getPath());
-        }
-        if (!file.exists() || !file.isDirectory()) {
-            throw new ContributionReadException(contribution.getLocation());
-        }
-        return file;
-    }
-
-
-}