Correct tag name

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

7 files changed, 0 insertions, 395 deletions

diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/ContributionConfiguration.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/ContributionConfiguration.java
deleted file mode 100644
index bf885644b0..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/ContributionConfiguration.java
+++ /dev/null
@@ -1,54 +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.workspace;
-
-/**
- * Represents an SCA contribution uri + location.
- */
-public final class ContributionConfiguration {
-    private String uri;
-    private String location;
-    
-    /**
-     * Constructs a new SCA contribution.
-     * 
-     * @param uri The URI that uniquely identifies the contribution in the SCA domain
-     * @param location The URL of the contribution archive
-     */
-    public ContributionConfiguration(String uri, String location) {
-        this.uri = uri;
-        this.location = location;
-    }
-    
-    /**
-     * Get the URI of the contribution
-     * @return The URI that uniquely identifies the contribution in the SCA domain
-     */
-    public String getURI() {
-        return uri;
-    }
-    
-    /**
-     * The location of the contribution
-     * @return The URL of the contribution archive
-     */
-    public String getLocation() {
-        return location;
-    }
-}
\ No newline at end of file
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
deleted file mode 100644
index e895669d23..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/DefaultWorkspaceFactory.java
+++ /dev/null
@@ -1,32 +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.workspace;
-
-import org.apache.tuscany.sca.workspace.impl.WorkspaceFactoryImpl;
-
-
-/**
- * Default implementation of a contribution workspace model factory.
- * 
- * @version $Rev$ $Date$
- */
-public class DefaultWorkspaceFactory extends WorkspaceFactoryImpl {
-    
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
deleted file mode 100644
index 66f38afec7..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/Workspace.java
+++ /dev/null
@@ -1,39 +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.workspace;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-
-/**
- * A workspace containing contributions.
- *
- * @version $Rev$ $Date$
- */
-public interface Workspace extends Contribution {
-
-    /**
-     * Returns the list of contributions in the workspace. 
-     * @return the list of contributions
-     */
-    List<Contribution> getContributions();
-    
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
deleted file mode 100644
index 2656068bea..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/WorkspaceFactory.java
+++ /dev/null
@@ -1,36 +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.workspace;
-
-
-
-/**
- * A factory for the contribution workspace model.
- * 
- * @version $Rev$ $Date$
- */
-public interface WorkspaceFactory {
-    
-  /**
-     * Create a new contribution workspace model object. 
-     * @return
-     */
-    Workspace createWorkspace();
-}
\ No newline at end of file
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
deleted file mode 100644
index 6fab700243..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/builder/ContributionDependencyBuilder.java
+++ /dev/null
@@ -1,42 +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.workspace.builder;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.workspace.Workspace;
-
-/**
- * A contribution dependency builder.
- *
- * @version $Rev$ $Date$
- */
-public interface ContributionDependencyBuilder {
-
-    /**
-     * Build the set of contributions that a contribution depends on.
-     * @param workspace
-     * @param contribution
-     * @return
-     */
-    List<Contribution> buildContributionDependencies(Contribution contribution, Workspace workspace);
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
deleted file mode 100644
index e41cc3ea83..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
+++ /dev/null
@@ -1,40 +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.workspace.impl;
-
-import org.apache.tuscany.sca.workspace.Workspace;
-import org.apache.tuscany.sca.workspace.WorkspaceFactory;
-
-
-/**
- * Default implementation of a contribution workspace model factory.
- * 
- * @version $Rev$ $Date$
- */
-public class WorkspaceFactoryImpl implements WorkspaceFactory {
-    
-    protected WorkspaceFactoryImpl() {
-    }
-    
-    public Workspace createWorkspace() {
-        return new WorkspaceImpl();
-    }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
deleted file mode 100644
index 9e242613eb..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceImpl.java
+++ /dev/null
@@ -1,152 +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.workspace.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.impl.ExtensibleImpl;
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Export;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.workspace.Workspace;
-
-/**
- * WorkspaceImpl
- *
- * @version $Rev$ $Date$
- */
-class WorkspaceImpl extends ExtensibleImpl implements Workspace {
-
-    private List<Contribution> contributions = new ArrayList<Contribution>();
-    private String location;
-    private String uri;
-    private Object model;
-    private byte[] contents;
-    private boolean unresolved;
-    private ModelResolver modelResolver;
-
-    /**
-     * Constructs a new workspace.
-     */
-    WorkspaceImpl() {
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public Object getModel() {
-        return model;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public void setModel(Object model) {
-        this.model = model;
-    }
-
-    public byte[] getContents() {
-        return contents;
-    }
-
-    public void setContents(byte[] contents) {
-        this.contents = contents;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public boolean isUnresolved() {
-        return unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-
-    public List<Contribution> getContributions() {
-        return contributions;
-    }
-
-    public List<Artifact> getArtifacts() {
-        return (List<Artifact>)(Object)contributions;
-    }
-
-    public ClassLoader getClassLoader() {
-        //FIXME Remove later
-        return null;
-    }
-
-    public void setClassLoader(ClassLoader classLoader) {
-        //FIXME Remove later
-    }
-
-    public List<Composite> getDeployables() {
-        List<Composite> deployables = new ArrayList<Composite>();
-        for (Contribution contribution: contributions) {
-            deployables.addAll(contribution.getDeployables());
-        }
-        return deployables;
-    }
-
-    public List<Export> getExports() {
-        List<Export> exports = new ArrayList<Export>();
-        for (Contribution contribution: contributions) {
-            exports.addAll(contribution.getExports());
-        }
-        return exports;
-    }
-
-    public List<Import> getImports() {
-        List<Import> imports = new ArrayList<Import>();
-        for (Contribution contribution: contributions) {
-            imports.addAll(contribution.getImports());
-        }
-        return imports;
-    }
-
-    public ModelResolver getModelResolver() {
-        return modelResolver;
-    }
-
-    public void setModelResolver(ModelResolver modelResolver) {
-        this.modelResolver = modelResolver;
-    }
-    
-    public String getType() {
-        // TODO type only used to determine contribution classloader
-        return null;
-    }
-    
-    public void setType(String contributionType) {
-        // TODO type only used to determine contribution classloader
-    }
-}